Imported Translations from Transifex

Change-Id: I6e296370ed88d24ed249d34e43b475e42c1574fa

diff --git a/quantum/locale/bg_BG/LC_MESSAGES/quantum.po b/quantum/locale/bg_BG/LC_MESSAGES/quantum.po
index 2bd7890e422bff773b2078a216c2c34c0ecff4fd..200885486b18f1428b037002e0ac8960346d25fd 100644 (file)
--- a/quantum/locale/bg_BG/LC_MESSAGES/quantum.po
+++ b/quantum/locale/bg_BG/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (Bulgaria) "
@@ -836,7 +836,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1460,107 +1460,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1884,287 +1884,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2294,7 +2225,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2423,15 +2354,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3087,6 +3018,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4356,83 +4317,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5582,7 +5543,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6671,408 +6632,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7563,75 +7524,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8647,6 +8608,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/cs/LC_MESSAGES/quantum.po b/quantum/locale/cs/LC_MESSAGES/quantum.po
index 47337cba192414a9b47cba614bf0266c1d8b9861..83ccb1b8ebcb110fdf8d815f8684a1cf5a8cbf8c 100644 (file)
--- a/quantum/locale/cs/LC_MESSAGES/quantum.po
+++ b/quantum/locale/cs/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech "
@@ -836,7 +836,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1460,107 +1460,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1884,287 +1884,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2294,7 +2225,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2423,15 +2354,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3087,6 +3018,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4356,83 +4317,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5582,7 +5543,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6671,408 +6632,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7563,75 +7524,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8647,6 +8608,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/da/LC_MESSAGES/quantum.po b/quantum/locale/da/LC_MESSAGES/quantum.po
index 70f2809f611f121defd3abe96f442e601056d01f..b54d505e94d2e71b2fbd5cf89cf1c6064072ba85 100644 (file)
--- a/quantum/locale/da/LC_MESSAGES/quantum.po
+++ b/quantum/locale/da/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Danish "
@@ -836,7 +836,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1460,107 +1460,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1884,287 +1884,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2294,7 +2225,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2423,15 +2354,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3087,6 +3018,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4356,83 +4317,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5582,7 +5543,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6671,408 +6632,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7563,75 +7524,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8647,6 +8608,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/de/LC_MESSAGES/quantum.po b/quantum/locale/de/LC_MESSAGES/quantum.po
index 408bc21c4a918ac520e0e4155b1099c5f1fbfeba..8286061231ae7aa6fabdeb97752741e554a5b5ca 100644 (file)
--- a/quantum/locale/de/LC_MESSAGES/quantum.po
+++ b/quantum/locale/de/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-05-22 08:17+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: German "
@@ -865,7 +865,7 @@ msgid "Authentication URL"
 msgstr "Authentifizierungs-URL"
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr "Der zu verwendende Authentifizierungtyp"
 
@@ -1532,55 +1532,55 @@ msgstr ""
 "Anforderung fehlgeschlagen: interner Serverfehler bei Verarbeitung Ihrer "
 "Anforderung."
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr "Das Host-IP, an das gebunden werden soll"
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr "Der Port, an den gebunden werden soll"
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr "Zu verwendende API-Paste-Konfigurationsdatei"
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr "Der Pfad für API-Erweiterungen"
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr "Die zu verwendende Richtliniendatei"
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr "Kern-Plug-in, das Quantum verwenden wird"
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr "Service-Plug-ins, die Quantum verwenden wird"
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr "Basis-MAC-Adresse, die Quantum für VIFs verwenden wird"
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr "Wie oft Quantum die MAC-Adressenerstellung erneut versuchen wird"
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr "Nutzung der Massenzuweisungs-API zulassen"
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr "Nutzung der Paginierung zulassen"
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr "Nutzung der Sortierung zulassen"
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
@@ -1589,57 +1589,57 @@ msgstr ""
 "Der Wert 'infinite' oder eine negative Ganzzahl bedeuten, dass es keine "
 "Begrenzung gibt"
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr "Maximale Anzahl an DNS-Namensservern"
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr "Maximale Anzahl an Hostroutes pro Teilnetz"
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr "Maximale Anzahl an statischen IP-Adressen per Port"
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr "DHCP-Leasedauer"
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 "Senden von Benachrichtigungen zu Ressourcenoperationen an den DHCP-"
 "Agenten zulassen"
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr "Überschneidung bei IP-Support in Quantum zulassen"
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr "Name von Host, auf dem Quantum ausgeführt wird"
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 "Stellen Sie sicher, dass sich das konfigurierte Gateway auf dem Teilnetz "
 "befindet"
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr "Basis-MAC-Adresse: %s"
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr "Protokollfunktion aktiviert!"
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr "Konfigurations-Paste-Datei: %s"
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -2003,121 +2003,37 @@ msgstr "Nachricht mit ungültiger Zeitmarke empfangen"
 msgid "Fail scheduling network %s"
 msgstr "Planung des Netzes '%s' fehlgeschlagen"
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-"Die SQLAlchemy-Verbindungszeichenfolge zum Herstellen einer Verbindung "
-"zur Datenbank"
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr "Wiederholungszeitintervalle bei Datenbankverbindungswiederholung"
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr "Intervall für Datenbankverbindungswiederholung in Sekunden"
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-"Mindestanzahl an SQL-Verbindungen, die in einem Pool betriebsbereit sein "
-"müssen"
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-"Höchstanzahl an SQL-Verbindungen, die in einem Pool betriebsbereit sein "
-"müssen"
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr "Zeitlimit in Sekunden vor dem Aufräumen inaktiver SQL-Verbindungen"
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr "Verwendung von 'db_pool' von Eventlet für MySQL aktivieren"
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-"Es wurde festgestellt, dass keine Verbindung zum mysql-Server mehr "
-"vorhanden ist: %s"
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr "Datenbankserver nicht mehr verbunden"
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-"Die Option 'sql_connection' ist in keiner Konfigurationsdatei angegeben -"
-" der Standardwert '%s' wird verwendet"
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-"Eventlet-Verbindungspooling wird ohne 'python-mysqldb' nicht "
-"funktionieren!"
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr "Datenbankverbindung verloren, beenden..."
-
-#: quantum/db/api.py:221
-#, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
-msgstr ""
-"Verbindung zu Datenbank kann nicht hergestellt werden, %(remaining)s "
-"verbleibende Versuche. Erneuter Versuch in %(reconnect_interval)s "
-"Sekunden"
-
-#: quantum/db/api.py:237
+#: quantum/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "Datenbankregistrierungsausnahme: %s"
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/api.py:75
+msgid "Database exception"
+msgstr ""
+
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr "Erstellen von Ressource für einen weiteren Nutzer nicht möglich"
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr "Erstellte MAC-Adresse für Netz %(network_id)s ist %(mac_address)s"
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 "Erstellte MAC-Adresse %(mac_address)s ist bereits vorhanden. "
 "%(max_retries)s verbleibende Versuche."
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr "Erstellen von MAC-Adresse nach %s Versuchen nicht möglich"
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
@@ -2126,49 +2042,49 @@ msgstr ""
 "Zugeordnete IP-Adresse %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s) blockieren"
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr "Kein Zuordnungspool für IP-Adresse gefunden:%s"
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr "%s erneut starten"
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr "Erneut starten: erste Übereinstimmung für %(first_ip)s-%(last_ip)s"
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr "Erneut starten: letzte Übereinstimmung für %(first_ip)s-%(last_ip)s"
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 "Erneut starten: %(first_ip1)s-%(last_ip1)s und %(first_ip2)s-%(last_ip2)s"
 " zusammengefügt"
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr "Erneut starten: zuerst %(first_ip)s-%(last_ip)s aktualisiert"
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr "Erneut starten: zuletzt %(first_ip)s-%(last_ip)s aktualisiert"
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr "Erneut starten: %(first_ip)s-%(last_ip)s neu erstellt"
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
@@ -2177,41 +2093,41 @@ msgstr ""
 "Keine statische IP-Adresse gefunden, die mit Netz %(network_id)s und IP-"
 "Adresse %(ip_address)s übereinstimmt."
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 "Löschen von zugeordneter IP-Adresse %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s)"
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr "Alle IP-Adressen von Teilnetz %(subnet_id)s (%(cidr)s) zugeordnet"
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr "Zugeordnete IP-Adresse - %(ip_address)s von %(first_ip)s bis %(last_ip)s"
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 "Keine weiteren freien IP-Adressen in Ausschnitt. Löschen von "
 "Zuordnungspool."
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr "'subnet_id' oder 'ip_address' für IP-Zuordnung erforderlich"
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 "IP-Adresse %s ist keine gültige IP-Adresse für die definierten Teilnetze "
 "des Netzes"
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
@@ -2220,26 +2136,26 @@ msgstr ""
 "Port auf Netz %(network_id)s wurde nicht erstellt, da 'fixed_ips' "
 "ungültiges Teilnetz %(subnet_id)s enthielt"
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr "IP-Adresse %s ist keine gültige IP-Adresse für das definierte Teilnetz"
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr "Maximale Anzahl an statischen IP-Adressen per Port überschritten"
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr "Portaktualisierung. Rückstellung von %s"
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr "Portaktualisierung. Hinzufügen von %s"
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
@@ -2248,7 +2164,7 @@ msgstr ""
 "Angefordertes Teilnetz mit CIDR: %(cidr)s für Netz: %(network_id)s "
 "enthält Überschneidungen mit einem anderen Teilnetz"
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
@@ -2257,70 +2173,70 @@ msgstr ""
 "Überprüfung für CIDR: %(new_cidr)s fehlgeschlagen - Überschneidung mit "
 "Teilnetz %(subnet_id)s (CIDR: %(cidr)s)"
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr "Durchführen von IP-Gültigkeitsprüfungen für Zuordnungspools"
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr "Ungültige IP-Adresse in Pool gefunden: %(start)s - %(end)s:"
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr "Angegebene IP-Adressen stimmen nicht mit der Teilnetz-IP-Version überein"
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr "Anfangs-IP-Adresse (%(start)s) ist größer als Ende-IP-Adresse (%(end)s)"
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr "Pool gefunden, der größer ist als Teilnetz-CIDR:%(start)s - %(end)s"
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr "Überprüfung auf Überschneidungen bei Zuordnungspools und Gateway-IP"
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr "Überschneidungen bei Bereichen gefunden: %(l_range)s und %(r_range)s"
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr "Ungültige Route: %s"
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr "Beim Erstellen von %(resource)s:%(item)s ist eine Ausnahme aufgetreten"
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr "%(name)s '%(addr)s' stimmt nicht mit 'ip_version' '%(ip_version)s' überein"
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr "Gateway ist auf Teilnetz nicht gültig"
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr "Fehler bei Auswertung der DNS-Adresse %s"
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 "Zugeordnete IP-Adresse %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr "%(address)s (%(subnet_id)s) wurde nicht erneut gestartet"
@@ -2469,7 +2385,7 @@ msgstr ""
 "bestimmten IP-Adresse bei Zuweisung einer dynamischen IP-Adresse "
 "erforderlich"
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr "'fixed_ip_address' kann nicht ohne 'port_id' angegeben werden"
 
@@ -2614,15 +2530,15 @@ msgstr "Provider-Modul für Quantum-Plug-in"
 msgid "Quantum quota driver class"
 msgstr "Quantum-Quotentreiberklasse"
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr "URL an Datenbank"
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr "Sie müssen eine Überarbeitung oder ein relatives Delta bereitstellen"
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr "Verfügbare Befehle"
 
@@ -3341,6 +3257,38 @@ msgstr "%s abgefangen, untergeordnete Elemente werden gestoppt"
 msgid "Waiting on %d children to exit"
 msgstr "Warten auf Beenden von %d untergeordneten Elementen"
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+"Es wurde festgestellt, dass keine Verbindung zum mysql-Server mehr "
+"vorhanden ist: %s"
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4668,83 +4616,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr "NexusDriver: %s"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr "NexusDriver-VLAN-IDs: %s"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr "Treiber %s geladen"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr "Aufruf von 'NexusPlugin:get_all_networks()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr "Aufruf von 'NexusPlugin:create_network()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr "Aufruf von 'NexusPlugin:delete_network()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr "Aufruf von 'NexusPlugin:get_network_details()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr "Aufruf von 'NexusPlugin:update_network()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr "Aufruf von 'NexusPlugin:get_all_ports()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr "Aufruf von 'NexusPlugin:create_port()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr "Aufruf von 'NexusPlugin:delete_port()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr "Aufruf von 'NexusPlugin:update_port()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr "Aufruf von 'NexusPlugin:get_port_details()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr "Aufruf von 'NexusPlugin:plug_interface()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr "Aufruf von 'NexusPlugin:unplug_interface()'"
 
@@ -5958,7 +5906,7 @@ msgstr ""
 "network=%(network)r"
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr "Netze mit 'admin_state_up=False' werden nicht unterstützt."
 
@@ -7118,22 +7066,22 @@ msgstr "Der Anforderung wird der Zugang zur referenzierten Ressource verweigert.
 msgid "The request has timed out."
 msgstr "Die Anforderung hat das zulässige Zeitlimit überschritten."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr "Der Standardservice des L2-Gateways kann nicht verarbeitet werden: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr "NVP-Routerport erstellt: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr "Erstellung von Port auf logischem NVP-Router %s nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
@@ -7142,12 +7090,12 @@ msgstr ""
 "Erstellung eines Ports für den logischen Router für Quantum-Port-ID "
 "%(port_id)s auf Router %(router_id)s nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr "'%(att)s' dem NVP-Routerport %(port)s zugeordnet"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
@@ -7157,7 +7105,7 @@ msgstr ""
 "%(r_port_id)s, der Quantum %(q_port_id)s zugeordnet ist, ist nicht "
 "möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
@@ -7166,13 +7114,13 @@ msgstr ""
 "Verbinden der Zusatzeinheit mit Routerport %(r_port_id)s für Quantum-"
 "Port-ID %(q_port_id)s auf Router %(router_id)s ist nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
@@ -7181,9 +7129,9 @@ msgstr ""
 "Das NVP-Plug-in unterstützt keine VIF-Standardports in externen Netzen. "
 "Port %s wird inaktiv sein."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
@@ -7192,28 +7140,28 @@ msgstr ""
 "'_nvp_create_port' für Port %(name)s in Netz %(network_id)s "
 "abgeschlossen. Die neue Port-ID lautet %(id)s."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr "Ausnahme bei Verbindung der Schnittstelle mit Netz %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr "Port '%s' wurde von der NVP-Plattform bereits gelöscht"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr "'_nvp_delete_port' für Port %(port_id)s in Netz %(net_id)s abgeschlossen"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr "Port %s in NVP nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
@@ -7222,7 +7170,7 @@ msgstr ""
 "Ausnahme wird ignoriert, da dies bedeutet, dass der Peer für Port '%s' "
 "bereits gelöscht wurde."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
@@ -7231,11 +7179,11 @@ msgstr ""
 "Die Erstellung von Routerschnittstellenports in externen Netzen wie %s "
 "ist nicht zulässig"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr "Beim Verbinden der Schnittstelle ist ein Fehler aufgetreten"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
@@ -7244,12 +7192,12 @@ msgstr ""
 "Das Feld 'device_id' muss ausgefüllt sein, damit ein externer Gateway-"
 "Port für Netz %s erstellt werden kann"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr "Der Gateway-Port für Router %s wurde auf der Back-End-NVP nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
@@ -7258,19 +7206,19 @@ msgstr ""
 "'_nvp_create_ext_gw_port' im externen Netz %(ext_net_id)s, angehängt an "
 "Router: %(router_id)s, abgeschlossen. NVP-Port-ID ist %(nvp_port_id)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 "Die Ressource %s des logischen Routers auf der NVP-Plattform nicht "
 "gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr "Logischer Router kann auf der NVP-Plattform nicht aktualisiert werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
@@ -7279,51 +7227,51 @@ msgstr ""
 "'_nvp_delete_ext_gw_port' im externen Netz %(ext_net_id)s, angehängt an "
 "Router: %(router_id)s, abgeschlossen"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr "Ausnahme bei Verbindung der Gateway-Schnittstelle mit Netz: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr "NVP-UUID für Quantum-Port %s kann nicht gefunden werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr "%s erforderlich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr "Segmentations-ID kann bei einfachem Netztyp nicht angegeben werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr "Segmentations-ID muss bei VLAN-Netztyp angegeben werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr "%(net_type_param)s %(net_type_value)s nicht unterstützt"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr "Kein Switch hat verfügbare Ports (%d geprüft)"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr "Maximale Anzahl an logischen Ports für logisches Netz %s erreicht"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
@@ -7332,22 +7280,22 @@ msgstr ""
 "Netze, für die 'admin_state_up=False' gilt, werden von diesem Plug-in "
 "noch nicht unterstützt. Einstellungen für Netz %s werden ignoriert"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr "Es wurde keine ID für den NVP-Loop-Port für Quantum-Port '%s' gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr "'delete_network' für Nutzer abgeschlossen: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr "Es wurde kein lSwitch %s in NVP gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
@@ -7356,19 +7304,19 @@ msgstr ""
 "Aktueller Netzstatus: %(nvp_net_status)s; Status in der Quantum-"
 "Datenbank: %(quantum_status)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr "Abrufen logischer Switches nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 "Logischer Switch %s wurde in Quantum-Datenbank gefunden, aber nicht in "
 "NVP. "
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
@@ -7377,26 +7325,26 @@ msgstr ""
 "%s logische Switches gefunden, die nicht an Quantum-Netze gebunden sind. "
 "Quantum und NVP sind möglicherweise nicht synchron"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr "'get_networks()' für Nutzer %s abgeschlossen"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr "LSwitch %s in NVP nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr "Abrufen von Ports nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr "Logischer Quantum-Port %s wurde auf NVP nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
@@ -7405,61 +7353,61 @@ msgstr ""
 "%s logische Ports gefunden, die nicht an Quantum-Ports gebunden sind. "
 "Quantum und NVP sind möglicherweise nicht synchron"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 "Erstellung eines Ports oder Einrichtung einer Zusatzeinheit des Ports in "
 "NVP nicht möglich."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr "'create_port' auf NVP für Nutzer %(tenant_id)s fertig gestellt: (%(id)s)"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr "Portanforderung aktualisieren: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr "Netz '%s' ist kein gültiges externes Netz"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr "Logischer Router kann auf der NVP-Plattform nicht erstellt werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr "Logischer Router %s auf der NVP-Plattform nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr "Logischer Router kann auf der NVP-Plattform nicht aktualisiert werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr "Logischer Router '%s' auf der NVP-Plattform nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr "Logischer Router kann auf der NVP-Plattform nicht gelöscht werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
@@ -7468,15 +7416,15 @@ msgstr ""
 "Aktueller Routerstatus: %(router_status)s; Status in der Quantum-"
 "Datenbank: %(db_router_status)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr "Abrufen des logischen Routers nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr "Abrufen des logischen Routers vom NVP-Controller nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
@@ -7485,7 +7433,7 @@ msgstr ""
 "%s logische Router gefunden, die nicht an Quantum-Router gebunden sind. "
 "Quantum und NVP sind möglicherweise nicht synchron"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
@@ -7494,7 +7442,7 @@ msgstr ""
 "Port %(port_id)s, verbunden mit Router %(router_id)s, wurde auf der Back-"
 "End-NVP nicht gefunden."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
@@ -7503,7 +7451,7 @@ msgstr ""
 "'Add_router_interface' für Teilnetz: %(subnet_id)s und Router: "
 "%(router_id)s abgeschlossen"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
@@ -7512,7 +7460,7 @@ msgstr ""
 "Port %(port_id)s, verbunden mit Router %(router_id)s, wurde auf der Back-"
 "End-NVP nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
@@ -7522,14 +7470,14 @@ msgstr ""
 "gefunden werden: %s. War dieser Ports jemals paarweise mit einem "
 "logischen Router verbunden?"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 "Port-Ressource %s des logischen Routers auf der NVP-Plattform nicht "
 "gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
@@ -7538,18 +7486,18 @@ msgstr ""
 "Fehler beim Entfernen von NAT-Regeln auf der NVP-Plattform für dynamische"
 " IP-Adresse: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 "Eine falsche Anzahl an übereinstimmenden NAT-Regeln wurde auf der NVP-"
 "Plattform gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr "Adressliste für Port des logischen Routers von NVP: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
@@ -7559,17 +7507,17 @@ msgstr ""
 " IP-Adresse: %(floating_ip)s, zugeordnet zu interner IP-Adresse: "
 "%(internal_ip)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr "Port '%s' ist keinen dynamischen IP-Adressen zugeordnet"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
@@ -7578,7 +7526,7 @@ msgstr ""
 "'Create_l2_gw_service' hat keine UUID für die neu erstellte Ressource "
 "zurückgegeben: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -8131,81 +8079,81 @@ msgstr "Speichern von neuem Authentifizierungscookie '%s'"
 msgid "_conn_str() invalid connection type: %s"
 msgstr "'_conn_str()' ungültiger Verbindungstyp: %s"
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr "Keine API-Verbindungen verfügbar"
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr "[%(rid)d] Ausgabe - Anforderung %(conn)s"
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr "Festlegen von Anforderungsheader 'X-Nvp-Wait-For-Config-Generation': '%s'"
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr "[%(rid)d] Ausnahme bei Ausgabe von Anforderung: %(e)s"
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 "[%(rid)d] Abgeschlossene Anforderung '%(conn)s': %(status)s (%(sec)0.2f "
 "Sekunden)"
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr "Lesen von 'X-Nvp-config-Generation'-Antwortheader: '%s'"
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 "[%d] Höchstanzahl an Weiterleitungen überschritten, Anforderung wird "
 "abgebrochen"
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr "[%(rid)d] Weiterleitung von Anforderung an: %(conn)s"
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr "[%(rid)d] Anforderung '%(method) %(url)s' erhalten: %(status)s"
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr "Serverfehler zurückgegeben: %s"
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr "Ungültige Serverantwort"
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 "[%(rid)d] Fehlgeschlagene Anforderung '%(conn)s': '%(msg)s' (%(sec)0.2f "
 "Sekunden)"
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr "[%d] Umleitungsstatus ohne Positionsheaderfeld erhalten"
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr "[%(rid)d] Ungültige Umleitungsposition erhalten: '%(url)s'"
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr "[%(rid)d] Fehlerhafte Umleitungsposition erhalten: '%(url)s'"
@@ -9293,6 +9241,72 @@ msgstr "lSwitch: %s nicht gefunden"
 msgid "lrouter:%s not found"
 msgstr "lRouter: %s nicht gefunden"
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
-#~ msgstr "Laufzeit von DHCP-Lease in Sekunden"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+#~ "Die SQLAlchemy-Verbindungszeichenfolge zum "
+#~ "Herstellen einer Verbindung zur Datenbank"
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr "Wiederholungszeitintervalle bei Datenbankverbindungswiederholung"
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr "Intervall für Datenbankverbindungswiederholung in Sekunden"
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+#~ "Mindestanzahl an SQL-Verbindungen, die "
+#~ "in einem Pool betriebsbereit sein müssen"
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+#~ "Höchstanzahl an SQL-Verbindungen, die in"
+#~ " einem Pool betriebsbereit sein müssen"
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr "Zeitlimit in Sekunden vor dem Aufräumen inaktiver SQL-Verbindungen"
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr "Verwendung von 'db_pool' von Eventlet für MySQL aktivieren"
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr "Datenbankserver nicht mehr verbunden"
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+#~ "Die Option 'sql_connection' ist in "
+#~ "keiner Konfigurationsdatei angegeben - der "
+#~ "Standardwert '%s' wird verwendet"
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+#~ "Eventlet-Verbindungspooling wird ohne "
+#~ "'python-mysqldb' nicht funktionieren!"
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr "Datenbankverbindung verloren, beenden..."
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
+#~ msgstr ""
+#~ "Verbindung zu Datenbank kann nicht "
+#~ "hergestellt werden, %(remaining)s verbleibende "
+#~ "Versuche. Erneuter Versuch in "
+#~ "%(reconnect_interval)s Sekunden"
 

diff --git a/quantum/locale/es/LC_MESSAGES/quantum.po b/quantum/locale/es/LC_MESSAGES/quantum.po
index 21628c3ac74ab0b927345f22966925ed6a6d2944..daf01b09ed4268d302936791985108190dbe2a9b 100644 (file)
--- a/quantum/locale/es/LC_MESSAGES/quantum.po
+++ b/quantum/locale/es/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish "
@@ -836,7 +836,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1460,107 +1460,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1884,287 +1884,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2294,7 +2225,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2423,15 +2354,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3087,6 +3018,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4356,83 +4317,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5582,7 +5543,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6671,408 +6632,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7563,75 +7524,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8647,6 +8608,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/fi_FI/LC_MESSAGES/quantum.po b/quantum/locale/fi_FI/LC_MESSAGES/quantum.po
index 8710f1cd62c5827af4bcd3c7bdf376c9836d985a..530e367bafc1460e74eebb8b275baaebaeec67bd 100644 (file)
--- a/quantum/locale/fi_FI/LC_MESSAGES/quantum.po
+++ b/quantum/locale/fi_FI/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish (Finland) "
@@ -836,7 +836,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1460,107 +1460,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1884,287 +1884,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2294,7 +2225,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2423,15 +2354,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3087,6 +3018,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4356,83 +4317,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5582,7 +5543,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6671,408 +6632,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7563,75 +7524,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8647,6 +8608,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/fr/LC_MESSAGES/quantum.po b/quantum/locale/fr/LC_MESSAGES/quantum.po
index e853fbfe29fec9c666994eae91b4221f6212cca2..48a32524985e1c8c9e9bb3bd978f33fcaeeae4fe 100644 (file)
--- a/quantum/locale/fr/LC_MESSAGES/quantum.po
+++ b/quantum/locale/fr/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French "
@@ -836,7 +836,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1460,107 +1460,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1884,287 +1884,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2294,7 +2225,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2423,15 +2354,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3087,6 +3018,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4356,83 +4317,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5582,7 +5543,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6671,408 +6632,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7563,75 +7524,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8647,6 +8608,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/it/LC_MESSAGES/quantum.po b/quantum/locale/it/LC_MESSAGES/quantum.po
index 538d34254d672c22bb67f3584154ba99faa24916..9062fbf0bf1d5503d514a371a1d0ac469241442a 100644 (file)
--- a/quantum/locale/it/LC_MESSAGES/quantum.po
+++ b/quantum/locale/it/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian "
@@ -836,7 +836,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1460,107 +1460,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1884,287 +1884,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2294,7 +2225,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2423,15 +2354,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3087,6 +3018,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4356,83 +4317,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5582,7 +5543,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6671,408 +6632,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7563,75 +7524,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8647,6 +8608,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/ja/LC_MESSAGES/quantum.po b/quantum/locale/ja/LC_MESSAGES/quantum.po
index a79873ea5b007bad8cc06409166c7b9598f33d90..94d029db959204a27d61784b4d5d584661165192 100644 (file)
--- a/quantum/locale/ja/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ja/LC_MESSAGES/quantum.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-01-30 10:28+0000\n"
 "Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
 "Language-Team: Japanese "
@@ -837,7 +837,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1461,107 +1461,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1885,287 +1885,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2295,7 +2226,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2424,15 +2355,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3088,6 +3019,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4357,83 +4318,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5583,7 +5544,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6672,408 +6633,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7564,75 +7525,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8648,6 +8609,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/ka_GE/LC_MESSAGES/quantum.po b/quantum/locale/ka_GE/LC_MESSAGES/quantum.po
index b4c4df2b0c03e676c1828104df07833cbcb884eb..3e130920d53f779e7b621112bcf3d3f61bb12f07 100644 (file)
--- a/quantum/locale/ka_GE/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ka_GE/LC_MESSAGES/quantum.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-04-19 14:53+0000\n"
 "Last-Translator: Nika Chkhikvishvili <frrrredo@gmail.com>\n"
 "Language-Team: ka_GE <LL@li.org>\n"
@@ -836,7 +836,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1460,107 +1460,107 @@ msgstr "%s ვერ განხორციელდა"
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr "ლოგირება ჩართულია!"
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1884,287 +1884,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2294,7 +2225,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2423,15 +2354,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3087,6 +3018,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4356,83 +4317,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5582,7 +5543,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6672,408 +6633,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, fuzzy, python-format
 msgid "Network %s was not found in NVP."
 msgstr "პლაგინი ვერ მოიძებნა."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7564,75 +7525,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8648,6 +8609,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/ko_KR/LC_MESSAGES/quantum.po b/quantum/locale/ko_KR/LC_MESSAGES/quantum.po
index 119d44734843f057efbc7d863dfdced61eb1a1e0..74dab9c6c2470fabc00742af5bf3efbb339c9bfa 100644 (file)
--- a/quantum/locale/ko_KR/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ko_KR/LC_MESSAGES/quantum.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-04-28 05:13+0000\n"
 "Last-Translator: ujuc Gang <potopro@gmail.com>\n"
 "Language-Team: ko_KR <LL@li.org>\n"
@@ -836,7 +836,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1460,107 +1460,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1884,287 +1884,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2294,7 +2225,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2423,15 +2354,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3087,6 +3018,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4356,83 +4317,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5582,7 +5543,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6671,408 +6632,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7563,75 +7524,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8647,6 +8608,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/pt_BR/LC_MESSAGES/quantum.po b/quantum/locale/pt_BR/LC_MESSAGES/quantum.po
index f3b05c612f0077a4115566e9a7e9fb95e8992b20..a766076333c648f534eb6c47cc08e4ce693b101d 100644 (file)
--- a/quantum/locale/pt_BR/LC_MESSAGES/quantum.po
+++ b/quantum/locale/pt_BR/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese (Brazil) "
@@ -836,7 +836,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1460,107 +1460,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1884,287 +1884,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2294,7 +2225,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2423,15 +2354,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3087,6 +3018,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4356,83 +4317,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5582,7 +5543,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6671,408 +6632,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7563,75 +7524,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8647,6 +8608,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/quantum.pot b/quantum/locale/quantum.pot
index 5aefa252083a7a2f79fe1d0ad0d0c8afe07cae28..4794b55940fd2146579d85ed66c9b70e55921671 100644 (file)
--- a/quantum/locale/quantum.pot
+++ b/quantum/locale/quantum.pot
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: quantum "
-"jenkins.quantum.propose.translation.update.148\n"
+"jenkins.quantum.propose.translation.update.149\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+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"
@@ -836,7 +836,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1460,107 +1460,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1884,287 +1884,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2294,7 +2225,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2423,15 +2354,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3087,6 +3018,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4356,83 +4317,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5582,7 +5543,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6671,408 +6632,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7563,75 +7524,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""

diff --git a/quantum/locale/ro/LC_MESSAGES/quantum.po b/quantum/locale/ro/LC_MESSAGES/quantum.po
index 0f4eecce4ef61cf1f6bd88e022e6622f94d1dd38..eed8bfdcd7fc9bfda807bbdedacbdf164ca858f3 100644 (file)
--- a/quantum/locale/ro/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ro/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-06-08 07:51+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Romanian "
@@ -837,7 +837,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1461,107 +1461,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1885,287 +1885,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2295,7 +2226,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2424,15 +2355,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3088,6 +3019,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4357,83 +4318,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5583,7 +5544,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6672,408 +6633,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7564,75 +7525,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8648,6 +8609,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/ru/LC_MESSAGES/quantum.po b/quantum/locale/ru/LC_MESSAGES/quantum.po
index ad07241170ca6970d9935d3a0055c00f39cc6f55..17fa97a400efceab9d50cf6fecb1cd3203315f0e 100644 (file)
--- a/quantum/locale/ru/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ru/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian "
@@ -837,7 +837,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1461,107 +1461,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1885,287 +1885,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2295,7 +2226,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2424,15 +2355,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3088,6 +3019,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4357,83 +4318,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5583,7 +5544,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6672,408 +6633,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7564,75 +7525,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8648,6 +8609,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/vi_VN/LC_MESSAGES/quantum.po b/quantum/locale/vi_VN/LC_MESSAGES/quantum.po
index 212a3fac35c2375e607daf9c9adda8d61b76e4a9..f51064a778a4a61b45b9807d18b3d52606dbe81e 100644 (file)
--- a/quantum/locale/vi_VN/LC_MESSAGES/quantum.po
+++ b/quantum/locale/vi_VN/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) "
@@ -836,7 +836,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1460,107 +1460,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1884,287 +1884,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2294,7 +2225,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2423,15 +2354,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3087,6 +3018,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4356,83 +4317,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5582,7 +5543,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6671,408 +6632,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7563,75 +7524,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8647,6 +8608,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/zh_CN/LC_MESSAGES/quantum.po b/quantum/locale/zh_CN/LC_MESSAGES/quantum.po
index 2b4427ebe8e8f5e4a48e1330a88dea28e20c1d77..f903359e512091a63a64d29cfddf1569fbde574e 100644 (file)
--- a/quantum/locale/zh_CN/LC_MESSAGES/quantum.po
+++ b/quantum/locale/zh_CN/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) "
@@ -836,7 +836,7 @@ msgid "Authentication URL"
 msgstr ""
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
@@ -1460,107 +1460,107 @@ msgstr ""
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr ""
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -1884,287 +1884,218 @@ msgstr ""
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr ""
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr ""
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr ""
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr ""
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr ""
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr ""
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr ""
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr ""
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr ""
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr ""
-
-#: quantum/db/api.py:221
+#: quantum/db/api.py:64
 #, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
+msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:237
-#, python-format
-msgid "Database registration exception: %s"
+#: quantum/db/api.py:75
+msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
@@ -2294,7 +2225,7 @@ msgid ""
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
@@ -2423,15 +2354,15 @@ msgstr ""
 msgid "Quantum quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr ""
 
@@ -3087,6 +3018,36 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4356,83 +4317,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
@@ -5582,7 +5543,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
@@ -6671,408 +6632,408 @@ msgstr ""
 msgid "The request has timed out."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s. NVP port id is %(nvp_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7563,75 +7524,75 @@ msgstr ""
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
@@ -8647,6 +8608,57 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr ""
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr ""
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr ""
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr ""
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr ""
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr ""
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr ""
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
 #~ msgstr ""
 

diff --git a/quantum/locale/zh_TW/LC_MESSAGES/quantum.po b/quantum/locale/zh_TW/LC_MESSAGES/quantum.po
index de63ea42ac72c1c423ef0a2f906941809ef6c7fc..7bcea7b1072a98fa8103a5d349c2a1b1cff1d33e 100644 (file)
--- a/quantum/locale/zh_TW/LC_MESSAGES/quantum.po
+++ b/quantum/locale/zh_TW/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-25 12:11+0000\n"
+"POT-Creation-Date: 2013-06-26 12:11+0000\n"
 "PO-Revision-Date: 2013-05-22 03:25+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) "
@@ -841,7 +841,7 @@ msgid "Authentication URL"
 msgstr "鑑別 URL"
 
 #: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:48 quantum/plugins/metaplugin/common/config.py:47
+#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr "要使用的鑑別類型"
 
@@ -1471,107 +1471,107 @@ msgstr "%s 失敗"
 msgid "Request Failed: internal server error while processing your request."
 msgstr "要求失敗：處理要求時發生內部伺服器錯誤。"
 
-#: quantum/common/config.py:38
+#: quantum/common/config.py:39
 msgid "The host IP to bind to"
 msgstr "要連結至的主機 IP"
 
-#: quantum/common/config.py:40
+#: quantum/common/config.py:41
 msgid "The port to bind to"
 msgstr "要連結至的埠"
 
-#: quantum/common/config.py:42
+#: quantum/common/config.py:43
 msgid "The API paste config file to use"
 msgstr "要使用的 API 貼上配置檔"
 
-#: quantum/common/config.py:44
+#: quantum/common/config.py:45
 msgid "The path for API extensions"
 msgstr "API 延伸的路徑"
 
-#: quantum/common/config.py:46
+#: quantum/common/config.py:47
 msgid "The policy file to use"
 msgstr "要使用的原則檔"
 
-#: quantum/common/config.py:50
+#: quantum/common/config.py:51
 msgid "The core plugin Quantum will use"
 msgstr "Quantum 將使用的核心外掛程式"
 
-#: quantum/common/config.py:52
+#: quantum/common/config.py:53
 msgid "The service plugins Quantum will use"
 msgstr "Quantum 將使用的服務外掛程式"
 
-#: quantum/common/config.py:54
+#: quantum/common/config.py:55
 msgid "The base MAC address Quantum will use for VIFs"
 msgstr "Quantum 將用於 VIF 的基本 MAC 位址"
 
-#: quantum/common/config.py:56
+#: quantum/common/config.py:57
 msgid "How many times Quantum will retry MAC generation"
 msgstr "Quantum 將重試 MAC 產生作業的次數"
 
-#: quantum/common/config.py:58
+#: quantum/common/config.py:59
 msgid "Allow the usage of the bulk API"
 msgstr "容許使用主體 API"
 
-#: quantum/common/config.py:60
+#: quantum/common/config.py:61
 msgid "Allow the usage of the pagination"
 msgstr "容許使用分頁"
 
-#: quantum/common/config.py:62
+#: quantum/common/config.py:63
 msgid "Allow the usage of the sorting"
 msgstr "容許使用排序"
 
-#: quantum/common/config.py:64
+#: quantum/common/config.py:65
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr "在單一回應中傳回的項目數上限，值為 'infinite' 或負整數時表示無限制"
 
-#: quantum/common/config.py:68
+#: quantum/common/config.py:69
 msgid "Maximum number of DNS nameservers"
 msgstr "DNS 名稱伺服器的數目上限"
 
-#: quantum/common/config.py:70
+#: quantum/common/config.py:71
 msgid "Maximum number of host routes per subnet"
 msgstr "每個子網路的主機路徑數目上限"
 
-#: quantum/common/config.py:72
+#: quantum/common/config.py:73
 msgid "Maximum number of fixed ips per port"
 msgstr "每個埠的固定 IP 數目上限"
 
-#: quantum/common/config.py:75
+#: quantum/common/config.py:76
 msgid "DHCP lease duration"
 msgstr "DHCP 租賃期間"
 
-#: quantum/common/config.py:77
+#: quantum/common/config.py:78
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr "容許將資源作業通知傳送給 DHCP 代理程式"
 
-#: quantum/common/config.py:80
+#: quantum/common/config.py:81
 msgid "Allow overlapping IP support in Quantum"
 msgstr "容許 Quantum 中的重疊 IP 支援"
 
-#: quantum/common/config.py:82
+#: quantum/common/config.py:83
 msgid "The hostname Quantum is running on"
 msgstr "Quantum 正在其中執行的主機名稱"
 
-#: quantum/common/config.py:84
+#: quantum/common/config.py:85
 msgid "Ensure that configured gateway is on subnet"
 msgstr "請確保所配置的閘道位於子網路上"
 
-#: quantum/common/config.py:107
+#: quantum/common/config.py:114
 #, python-format
 msgid "Base MAC: %s"
 msgstr "基本 MAC：%s"
 
-#: quantum/common/config.py:118
+#: quantum/common/config.py:125
 msgid "Logging enabled!"
 msgstr "已啟用記載！"
 
-#: quantum/common/config.py:131
+#: quantum/common/config.py:138
 #, python-format
 msgid "Config paste file: %s"
 msgstr "配置貼上檔案：%s"
 
-#: quantum/common/config.py:136
+#: quantum/common/config.py:143
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr "無法從配置檔 %(config_path)s 載入 %(app_name)s。"
@@ -1897,287 +1897,218 @@ msgstr "收到含有無效時間戳記的訊息"
 msgid "Fail scheduling network %s"
 msgstr "無法排程網路 %s"
 
-#: quantum/db/api.py:44
-msgid "The SQLAlchemy connection string used to connect to the database"
-msgstr "用於連接資料庫的 SQLAlchemy 連線字串"
-
-#: quantum/db/api.py:48
-msgid "Database reconnection retry times"
-msgstr "資料庫重新連線重試次數"
-
-#: quantum/db/api.py:50
-msgid "Database reconnection interval in seconds"
-msgstr "資料庫重新連線間隔（以秒為單位）"
-
-#: quantum/db/api.py:53
-msgid "Minimum number of SQL connections to keep open in a pool"
-msgstr "在儲存區中保持開啟的 SQL 連線數目下限"
-
-#: quantum/db/api.py:57
-msgid "Maximum number of SQL connections to keep open in a pool"
-msgstr "在儲存區中保持開啟的 SQL 連線數目上限"
-
-#: quantum/db/api.py:61
-msgid "Timeout in seconds before idle sql connections are reaped"
-msgstr "回收閒置 SQL 連線之前的逾時時間（以秒為單位）"
-
-#: quantum/db/api.py:65
-msgid "Enable the use of eventlet's db_pool for MySQL"
-msgstr "對 MySQL 啟用 eventlet 的 db_pool"
-
-#: quantum/db/api.py:68
-msgid ""
-"Maximum number of SQL connections to keep open in a QueuePool in "
-"SQLAlchemy"
-msgstr ""
-
-#: quantum/db/api.py:72
-msgid "If set, use this value for max_overflow with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:76
-msgid "If set, use this value for pool_timeout with sqlalchemy"
-msgstr ""
-
-#: quantum/db/api.py:99
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr "已取得 mysql 伺服器已斷線的訊息：%s"
-
-#: quantum/db/api.py:100
-msgid "Database server went away"
-msgstr "資料庫伺服器已斷線"
-
-#: quantum/db/api.py:126
-#, python-format
-msgid ""
-"Option 'sql_connection' not specified in any config file - using default "
-"value '%s'"
-msgstr "未在任何配置檔中指定選項 'sql_connection' - 正在使用預設值 '%s'"
-
-#: quantum/db/api.py:171
-msgid "Eventlet connection pooling will not work without python-mysqldb!"
-msgstr "如果未指定 python-mysqldb，則 eventlet 連線儲存區將無法運作！"
-
-#: quantum/db/api.py:218
-msgid "Database connection lost, exit..."
-msgstr "資料庫連線已中斷，結束..."
-
-#: quantum/db/api.py:221
-#, python-format
-msgid ""
-"Unable to connect to database, %(remaining)s attempts left. Retrying in "
-"%(reconnect_interval)s seconds"
-msgstr "無法連接至資料庫，還可以嘗試 %(remaining)s 次。將在 %(reconnect_interval)s 秒鐘後重試"
-
-#: quantum/db/api.py:237
+#: quantum/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "資料庫登錄異常狀況：%s"
 
-#: quantum/db/db_base_plugin_v2.py:125
+#: quantum/db/api.py:75
+msgid "Database exception"
+msgstr ""
+
+#: quantum/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr "無法給另一個 Tenant 建立資源"
 
-#: quantum/db/db_base_plugin_v2.py:273
+#: quantum/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr "給網路 %(network_id)s 產生的 MAC 位址是 %(mac_address)s"
 
-#: quantum/db/db_base_plugin_v2.py:279
+#: quantum/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr "產生的 MAC 位址 %(mac_address)s 已存在。還可以嘗試 %(max_retries)s 次。"
 
-#: quantum/db/db_base_plugin_v2.py:283
+#: quantum/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr "嘗試 %s 次之後仍無法產生 MAC 位址"
 
-#: quantum/db/db_base_plugin_v2.py:313
+#: quantum/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr "保留所配置的 IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 
-#: quantum/db/db_base_plugin_v2.py:364
+#: quantum/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr "找不到 IP 位址的配置儲存區：%s"
 
-#: quantum/db/db_base_plugin_v2.py:377
+#: quantum/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr "回收 %s"
 
-#: quantum/db/db_base_plugin_v2.py:381
+#: quantum/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr "回收：%(first_ip)s-%(last_ip)s 的第一個相符項"
 
-#: quantum/db/db_base_plugin_v2.py:388
+#: quantum/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr "回收：%(first_ip)s-%(last_ip)s 的最後一個相符項"
 
-#: quantum/db/db_base_plugin_v2.py:400
+#: quantum/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr "回收：已合併 %(first_ip1)s-%(last_ip1)s 及 %(first_ip2)s-%(last_ip2)s"
 
-#: quantum/db/db_base_plugin_v2.py:409
+#: quantum/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr "回收：已更新第一個 %(first_ip)s-%(last_ip)s"
 
-#: quantum/db/db_base_plugin_v2.py:414
+#: quantum/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr "回收：已更新最後一個 %(first_ip)s-%(last_ip)s"
 
-#: quantum/db/db_base_plugin_v2.py:423
+#: quantum/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr "回收：已建立新的 %(first_ip)s-%(last_ip)s"
 
-#: quantum/db/db_base_plugin_v2.py:447
+#: quantum/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr "找不到與網路 %(network_id)s 及 IP 位址 %(ip_address)s 相符的固定 IP。"
 
-#: quantum/db/db_base_plugin_v2.py:456
+#: quantum/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr "刪除所配置的 IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 
-#: quantum/db/db_base_plugin_v2.py:480
+#: quantum/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr "子網路 %(subnet_id)s (%(cidr)s) 的所有 IP 都已配置"
 
-#: quantum/db/db_base_plugin_v2.py:485
+#: quantum/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr "已配置 IP - %(ip_address)s（從 %(first_ip)s 到 %(last_ip)s）"
 
-#: quantum/db/db_base_plugin_v2.py:492
+#: quantum/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr "截塊中沒有更多的可用 IP。正在刪除配置儲存區。"
 
-#: quantum/db/db_base_plugin_v2.py:599
+#: quantum/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr "IP 配置需要 subnet_id 或 ip_address"
 
-#: quantum/db/db_base_plugin_v2.py:611
+#: quantum/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr "IP 位址 %s 不是所定義網路子網路的有效 IP"
 
-#: quantum/db/db_base_plugin_v2.py:617
+#: quantum/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr "無法在網路 %(network_id)s 上建立埠，因為 fixed_ips 包含無效的子網路 %(subnet_id)s"
 
-#: quantum/db/db_base_plugin_v2.py:637
+#: quantum/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr "IP 位址 %s 不是所定義子網路的有效 IP"
 
-#: quantum/db/db_base_plugin_v2.py:646 quantum/db/db_base_plugin_v2.py:679
+#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr "已超出每個埠的固定 IP 數目上限"
 
-#: quantum/db/db_base_plugin_v2.py:694
+#: quantum/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr "埠更新。保留 %s"
 
-#: quantum/db/db_base_plugin_v2.py:702
+#: quantum/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr "埠更新。正在新增 %s"
 
-#: quantum/db/db_base_plugin_v2.py:757
+#: quantum/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr "所要求的網路 %(network_id)s 子網路 (CIDR %(cidr)s) 與另一個子網路重疊"
 
-#: quantum/db/db_base_plugin_v2.py:762
+#: quantum/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr "驗證 CIDR %(new_cidr)s 失敗 - 與子網路 %(subnet_id)s (CIDR %(cidr)s) 重疊"
 
-#: quantum/db/db_base_plugin_v2.py:782
+#: quantum/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr "正在對配置儲存區執行 IP 驗證檢查"
 
-#: quantum/db/db_base_plugin_v2.py:789
+#: quantum/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr "在儲存區中發現無效的 IP 位址：%(start)s - %(end)s："
 
-#: quantum/db/db_base_plugin_v2.py:796
+#: quantum/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr "指定的 IP 位址與子網路 IP 版本不符"
 
-#: quantum/db/db_base_plugin_v2.py:800
+#: quantum/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr "起始 IP (%(start)s) 大於結尾 IP (%(end)s)"
 
-#: quantum/db/db_base_plugin_v2.py:805
+#: quantum/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr "找到的儲存區大於子網路 CIDR：%(start)s - %(end)s"
 
-#: quantum/db/db_base_plugin_v2.py:818
+#: quantum/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr "正在檢查配置儲存區及閘道 IP 之間是否有重疊"
 
-#: quantum/db/db_base_plugin_v2.py:829
+#: quantum/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr "發現重疊的範圍：%(l_range)s 及 %(r_range)s"
 
-#: quantum/db/db_base_plugin_v2.py:842 quantum/db/db_base_plugin_v2.py:846
+#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr "無效的路徑：%s"
 
-#: quantum/db/db_base_plugin_v2.py:962
+#: quantum/db/db_base_plugin_v2.py:964
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr "建立 %(resource)s:%(item)s 時發生異常狀況"
 
-#: quantum/db/db_base_plugin_v2.py:1062
+#: quantum/db/db_base_plugin_v2.py:1063
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr "%(name)s '%(addr)s' 與 ip_version '%(ip_version)s' 不符"
 
-#: quantum/db/db_base_plugin_v2.py:1086
+#: quantum/db/db_base_plugin_v2.py:1087
 msgid "Gateway is not valid on subnet"
 msgstr "閘道在子網路上無效"
 
-#: quantum/db/db_base_plugin_v2.py:1099
+#: quantum/db/db_base_plugin_v2.py:1100
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr "剖析 DNS 位址 %s 時發生錯誤"
 
-#: quantum/db/db_base_plugin_v2.py:1361
+#: quantum/db/db_base_plugin_v2.py:1362
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr "已配置 IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 
-#: quantum/db/db_base_plugin_v2.py:1441
+#: quantum/db/db_base_plugin_v2.py:1442
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr "%(address)s (%(subnet_id)s) 未回收"
@@ -2309,7 +2240,7 @@ msgid ""
 "assigning a floating IP"
 msgstr "埠 %s 具有多個固定 IP。指派浮動 IP 時必須提供特定 IP"
 
-#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1813
+#: quantum/db/l3_db.py:600 quantum/plugins/nicira/QuantumPlugin.py:1815
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr "如果未指定 port_id，則無法指定 fixed_ip_address"
 
@@ -2440,15 +2371,15 @@ msgstr "Quantum 外掛程式提供者模組"
 msgid "Quantum quota driver class"
 msgstr "Quantum 配額驅動程式類別"
 
-#: quantum/db/migration/cli.py:42
+#: quantum/db/migration/cli.py:43
 msgid "URL to database"
 msgstr "資料庫 URL"
 
-#: quantum/db/migration/cli.py:64
+#: quantum/db/migration/cli.py:65
 msgid "You must provide a revision or relative delta"
 msgstr "必須提供修訂或相對差異"
 
-#: quantum/db/migration/cli.py:119
+#: quantum/db/migration/cli.py:120
 msgid "Available commands"
 msgstr "可用的指令"
 
@@ -3108,6 +3039,36 @@ msgstr "已捕捉到 %s，正在停止子項"
 msgid "Waiting on %d children to exit"
 msgstr "正在等待 %d 個子項結束"
 
+#: quantum/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:544
+msgid "DB exception wrapped."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr "已取得 mysql 伺服器已斷線的訊息：%s"
+
+#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: quantum/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -4383,83 +4344,83 @@ msgstr ""
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:134
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:141
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:158
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:169
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:243
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr "NexusDriver：%s"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:185
+#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr "NexusDriver VLAN ID：%s"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
 #, python-format
 msgid "Loaded driver %s"
 msgstr "已載入驅動程式 %s"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
 msgid "NexusPlugin:get_all_networks() called"
 msgstr "已呼叫 NexusPlugin:get_all_networks()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
 msgid "NexusPlugin:create_network() called"
 msgstr "已呼叫 NexusPlugin:create_network()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:213
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:232
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:243
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
 msgid "NexusPlugin:delete_network() called"
 msgstr "已呼叫 NexusPlugin:delete_network()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:247
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
 msgid "NexusPlugin:get_network_details() called"
 msgstr "已呼叫 NexusPlugin:get_network_details()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:253
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
 msgid "NexusPlugin:update_network() called"
 msgstr "已呼叫 NexusPlugin:update_network()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:261
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
 msgid "NexusPlugin:get_all_ports() called"
 msgstr "已呼叫 NexusPlugin:get_all_ports()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:269
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
 msgid "NexusPlugin:create_port() called"
 msgstr "已呼叫 NexusPlugin:create_port()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:277
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
 msgid "NexusPlugin:delete_port() called"
 msgstr "已呼叫 NexusPlugin:delete_port()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:328
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
 msgid "NexusPlugin:update_port() called"
 msgstr "已呼叫 NexusPlugin:update_port()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:336
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
 msgid "NexusPlugin:get_port_details() called"
 msgstr "已呼叫 NexusPlugin:get_port_details()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:345
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
 msgid "NexusPlugin:plug_interface() called"
 msgstr "已呼叫 NexusPlugin:plug_interface()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:353
+#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
 msgid "NexusPlugin:unplug_interface() called"
 msgstr "已呼叫 NexusPlugin:unplug_interface()"
 
@@ -5625,7 +5586,7 @@ msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr "已呼叫 MidonetPluginV2.update_network：ID = %(id)r，網路 = %(network)r"
 
 #: quantum/plugins/midonet/plugin.py:196
-#: quantum/plugins/nicira/QuantumPlugin.py:1039
+#: quantum/plugins/nicira/QuantumPlugin.py:1040
 msgid "admin_state_up=False networks are not supported."
 msgstr "不支援 admin_state_up = False 網路。"
 
@@ -6745,41 +6706,41 @@ msgstr "已禁止要求存取所參照的資源。"
 msgid "The request has timed out."
 msgstr "要求已逾時。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:236
+#: quantum/plugins/nicira/QuantumPlugin.py:237
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr "無法處理預設 l2 gw 服務：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:271
+#: quantum/plugins/nicira/QuantumPlugin.py:272
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr "已建立 NVP 路由器埠：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:273
+#: quantum/plugins/nicira/QuantumPlugin.py:274
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr "無法在 NVP 邏輯路由器 %s 上建立埠"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:276
+#: quantum/plugins/nicira/QuantumPlugin.py:277
 #, python-format
 msgid ""
 "Unable to create logical router port for quantum port id %(port_id)s on "
 "router %(router_id)s"
 msgstr "無法給路由器 %(router_id)s 上的 Quantum 埠 ID %(port_id)s 建立邏輯路由器埠"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:298
+#: quantum/plugins/nicira/QuantumPlugin.py:299
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr "已將 %(att)s 連接至 NVP 路由器埠 %(port)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:304
+#: quantum/plugins/nicira/QuantumPlugin.py:305
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
 "associated with Quantum %(q_port_id)s"
 msgstr "無法將連接裝置插入與 Quantum %(q_port_id)s 相關聯的 NVP 邏輯路由器埠 %(r_port_id)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:310
+#: quantum/plugins/nicira/QuantumPlugin.py:311
 #, python-format
 msgid ""
 "Unable to plug attachment in router port %(r_port_id)s for quantum port "
@@ -6788,80 +6749,80 @@ msgstr ""
 "無法將連接裝置插入路由器 %(router_id)s 上 Quantum 埠 ID %(q_port_id)s 的路由器埠 "
 "%(r_port_id)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:355
+#: quantum/plugins/nicira/QuantumPlugin.py:356
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:381
-#: quantum/plugins/nicira/QuantumPlugin.py:416
-#: quantum/plugins/nicira/QuantumPlugin.py:606
+#: quantum/plugins/nicira/QuantumPlugin.py:382
+#: quantum/plugins/nicira/QuantumPlugin.py:417
+#: quantum/plugins/nicira/QuantumPlugin.py:607
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
 "%s will be down."
 msgstr "NVP 外掛程式不支援外部網路上的一般 VIF 埠。埠 %s 將關閉。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:401
-#: quantum/plugins/nicira/QuantumPlugin.py:482
-#: quantum/plugins/nicira/QuantumPlugin.py:626
+#: quantum/plugins/nicira/QuantumPlugin.py:402
+#: quantum/plugins/nicira/QuantumPlugin.py:483
+#: quantum/plugins/nicira/QuantumPlugin.py:627
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
 "The new port id is %(id)s."
 msgstr "對網路 %(network_id)s 上埠 %(name)s 執行的 _nvp_create_port 已完成。新的埠 ID 為 %(id)s。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:405
+#: quantum/plugins/nicira/QuantumPlugin.py:406
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr "將介面插入網路時發生異常狀況：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:423
+#: quantum/plugins/nicira/QuantumPlugin.py:424
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr "已在 NVP 平台上刪除了埠 '%s'"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:432
+#: quantum/plugins/nicira/QuantumPlugin.py:433
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr "對網路 %(net_id)s 上埠 %(port_id)s 執行的 _nvp_delete_port 已完成"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:438
+#: quantum/plugins/nicira/QuantumPlugin.py:439
 #, python-format
 msgid "port %s not found in NVP"
 msgstr "在 NVP 中找不到埠 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:457
-#: quantum/plugins/nicira/QuantumPlugin.py:890
+#: quantum/plugins/nicira/QuantumPlugin.py:458
+#: quantum/plugins/nicira/QuantumPlugin.py:891
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr "正在忽略異常狀況，因為這意味著埠 '%s' 的同層級已刪除。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:469
+#: quantum/plugins/nicira/QuantumPlugin.py:470
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr "不容許在外部網路上建立路由器介面埠來作為 '%s'"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:487
+#: quantum/plugins/nicira/QuantumPlugin.py:488
 msgid "An exception occured while plugging the interface"
 msgstr "將介面插入時發生異常狀況"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:495
+#: quantum/plugins/nicira/QuantumPlugin.py:496
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
 "port for network %s"
 msgstr "必須將資料移入 device_id 欄位，才能給網路 %s 建立外部閘道埠"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:503
+#: quantum/plugins/nicira/QuantumPlugin.py:504
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr "在 NVP 後端找不到路由器 %s 的閘道埠"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:549
+#: quantum/plugins/nicira/QuantumPlugin.py:550
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
@@ -6870,287 +6831,287 @@ msgstr ""
 "已在路由器 %(router_id)s 所連接的外部網路 %(ext_net_id)s 上完成 "
 "_nvp_create_ext_gw_port。NVP 埠 ID 為 %(nvp_port_id)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:587
+#: quantum/plugins/nicira/QuantumPlugin.py:588
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr "在 NVP 平台上找不到邏輯路由器資源 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:591
-#: quantum/plugins/nicira/QuantumPlugin.py:1758
+#: quantum/plugins/nicira/QuantumPlugin.py:592
+#: quantum/plugins/nicira/QuantumPlugin.py:1760
 msgid "Unable to update logical routeron NVP Platform"
 msgstr "無法在 NVP 平台上更新邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: quantum/plugins/nicira/QuantumPlugin.py:594
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
 "attached to router:%(router_id)s"
 msgstr "已在路由器 %(router_id)s 所連接的外部網路 %(ext_net_id)s 上完成 _nvp_delete_ext_gw_port"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:631
+#: quantum/plugins/nicira/QuantumPlugin.py:632
 #, python-format
 msgid "An exception occured while plugging the gateway interface into network:%s"
 msgstr "將閘道介面插入網路時發生異常狀況：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:671
+#: quantum/plugins/nicira/QuantumPlugin.py:672
 #, python-format
 msgid "Unable to find NVP uuid for Quantum port %s"
 msgstr "找不到 Quantum 埠 %s 的 NVP UUID"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:700
+#: quantum/plugins/nicira/QuantumPlugin.py:701
 #, python-format
 msgid "%s required"
 msgstr "需要 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:704
+#: quantum/plugins/nicira/QuantumPlugin.py:705
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr "無法使用平面網路類型來指定分段 ID"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:708
+#: quantum/plugins/nicira/QuantumPlugin.py:709
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr "必須使用 VLAN 網路類型來指定分段 ID"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
-#: quantum/plugins/nicira/QuantumPlugin.py:727
+#: quantum/plugins/nicira/QuantumPlugin.py:713
+#: quantum/plugins/nicira/QuantumPlugin.py:728
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:733
+#: quantum/plugins/nicira/QuantumPlugin.py:734
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr "不支援 %(net_type_param)s %(net_type_value)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:764
+#: quantum/plugins/nicira/QuantumPlugin.py:765
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr "交換器沒有可用的埠（已檢查 %d 個）"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:786
+#: quantum/plugins/nicira/QuantumPlugin.py:787
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr "已達到邏輯網路 %s 的邏輯埠數目上限"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:813
+#: quantum/plugins/nicira/QuantumPlugin.py:814
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
 "Ignoring setting for network %s"
 msgstr "此外掛程式尚不支援 admin_state_up = False 的網路。正在忽略對網路 %s 的設定"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:872
+#: quantum/plugins/nicira/QuantumPlugin.py:873
 #, python-format
 msgid "A nvp lport identifier was not found for quantum port '%s'"
 msgstr "找不到 Quantum 埠 '%s' 的 NVP lport ID"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:900
+#: quantum/plugins/nicira/QuantumPlugin.py:901
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr "已對 Tenant 完成 delete_network：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:903
+#: quantum/plugins/nicira/QuantumPlugin.py:904
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr "在 NVP 中找不到 lswitch %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:929
+#: quantum/plugins/nicira/QuantumPlugin.py:930
 #, python-format
 msgid ""
 "Current network status:%(nvp_net_status)s; Status in Quantum "
 "DB:%(quantum_status)s"
 msgstr "現行網路狀態：%(nvp_net_status)s；Quantum DB 中的狀態：%(quantum_status)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:939
-#: quantum/plugins/nicira/QuantumPlugin.py:989
+#: quantum/plugins/nicira/QuantumPlugin.py:940
+#: quantum/plugins/nicira/QuantumPlugin.py:990
 msgid "Unable to get logical switches"
 msgstr "無法取得邏輯交換器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1003
+#: quantum/plugins/nicira/QuantumPlugin.py:1004
 #, python-format
 msgid "Logical Switch %s found in quantum database but not in NVP."
 msgstr "邏輯交換器 %s 位在 Quantum 資料庫中，但不在 NVP 中。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1018
+#: quantum/plugins/nicira/QuantumPlugin.py:1019
 #, python-format
 msgid ""
 "Found %s logical switches not bound to Quantum networks. Quantum and NVP "
 "are potentially out of sync"
 msgstr "發現有 %s 個邏輯交換器未連結至 Quantum 網路。Quantum 與 NVP 可能不同步"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1022
+#: quantum/plugins/nicira/QuantumPlugin.py:1023
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr "已對 Tenant %s 完成 get_networks()"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1106
+#: quantum/plugins/nicira/QuantumPlugin.py:1107
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr "在 NVP 中找不到 lswitch %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1115
+#: quantum/plugins/nicira/QuantumPlugin.py:1116
 msgid "Unable to get ports"
 msgstr "無法取得埠"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1142
+#: quantum/plugins/nicira/QuantumPlugin.py:1143
 #, python-format
 msgid "Quantum logical port %s was not found on NVP"
 msgstr "在 NVP 上找不到 Quantum 邏輯埠 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1149
+#: quantum/plugins/nicira/QuantumPlugin.py:1150
 #, python-format
 msgid ""
 "Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
 "potentially out of sync"
 msgstr "發現有 %s 個邏輯埠未連結至 Quantum 埠。Quantum 與 NVP 可能不同步"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1215
+#: quantum/plugins/nicira/QuantumPlugin.py:1216
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1221
+#: quantum/plugins/nicira/QuantumPlugin.py:1224
 msgid "Unable to create port or set port attachment in NVP."
 msgstr "無法在 NVP 中建立埠或設定埠連接裝置。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1226
+#: quantum/plugins/nicira/QuantumPlugin.py:1228
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr "已對 Tenant %(tenant_id)s 的 NVP 完成 create_port：(%(id)s)"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1301
+#: quantum/plugins/nicira/QuantumPlugin.py:1303
 #, python-format
 msgid "Update port request: %s"
 msgstr "更新埠要求：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1327
+#: quantum/plugins/nicira/QuantumPlugin.py:1329
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1451
-#: quantum/plugins/nicira/QuantumPlugin.py:1496
+#: quantum/plugins/nicira/QuantumPlugin.py:1453
+#: quantum/plugins/nicira/QuantumPlugin.py:1498
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr "網路 '%s' 不是有效的外部網路"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1464
+#: quantum/plugins/nicira/QuantumPlugin.py:1466
 msgid "Unable to create logical router on NVP Platform"
 msgstr "無法在 NVP 平台上建立邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1506
+#: quantum/plugins/nicira/QuantumPlugin.py:1508
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr "在 NVP 平台上找不到邏輯路由器 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1509
+#: quantum/plugins/nicira/QuantumPlugin.py:1511
 msgid "Unable to update logical router on NVP Platform"
 msgstr "無法在 NVP 平台上更新邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1529
+#: quantum/plugins/nicira/QuantumPlugin.py:1531
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr "在 NVP 平台上找不到邏輯路由器 '%s'"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1533
+#: quantum/plugins/nicira/QuantumPlugin.py:1535
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr "無法在 NVP 平台上刪除邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1554
+#: quantum/plugins/nicira/QuantumPlugin.py:1556
 #, python-format
 msgid ""
 "Current router status:%(router_status)s;Status in Quantum "
 "DB:%(db_router_status)s"
 msgstr "現行路由器狀態：%(router_status)s；Quantum DB 中的狀態：%(db_router_status)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1562
+#: quantum/plugins/nicira/QuantumPlugin.py:1564
 msgid "Unable to get logical router"
 msgstr "無法取得邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1585
+#: quantum/plugins/nicira/QuantumPlugin.py:1587
 msgid "Unable to get logical routers from NVP controller"
 msgstr "無法從 NVP 控制器取得邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1607
+#: quantum/plugins/nicira/QuantumPlugin.py:1609
 #, python-format
 msgid ""
 "Found %s logical routers not bound to Quantum routers. Quantum and NVP "
 "are potentially out of sync"
 msgstr "發現有 %s 個邏輯路由器未連結至 Quantum 路由器。Quantum 與 NVP 可能不同步"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1633
+#: quantum/plugins/nicira/QuantumPlugin.py:1635
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend."
 msgstr "在 NVP 後端找不到路由器 %(router_id)s 所連接的埠 %(port_id)s。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1668
+#: quantum/plugins/nicira/QuantumPlugin.py:1670
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr "已對子網路 %(subnet_id)s 及路由器 %(router_id)s 完成 Add_router_interface"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1713
+#: quantum/plugins/nicira/QuantumPlugin.py:1715
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
 " on the NVP backend"
 msgstr "在 NVP 後端找不到路由器 %(router_id)s 所連接的埠 %(port_id)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1725
+#: quantum/plugins/nicira/QuantumPlugin.py:1727
 #, python-format
 msgid ""
 "Unable to find NVP logical router port for Quantum port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr "找不到 Quantum 埠 ID %s 的 NVP 邏輯路由器埠。此埠是否曾與邏輯路由器配對？"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1754
+#: quantum/plugins/nicira/QuantumPlugin.py:1756
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr "在 NVP 平台上找不到邏輯路由器埠資源 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1780
+#: quantum/plugins/nicira/QuantumPlugin.py:1782
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr "在 NVP 平台上移除浮動 IP 的 NAT 規則時發生錯誤：%s。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1786
+#: quantum/plugins/nicira/QuantumPlugin.py:1788
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr "在 NVP 平台上找到的相符 NAT 規則數目不正確"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1852
+#: quantum/plugins/nicira/QuantumPlugin.py:1854
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr "NVP 邏輯路由器埠的位址清單：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1876
+#: quantum/plugins/nicira/QuantumPlugin.py:1878
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
 "floating ip:%(floating_ip)s mapped to internal ip:%(internal_ip)s"
 msgstr "在 NVP 平台上給浮動 IP %(floating_ip)s（已對映到內部 IP %(internal_ip)s）建立 NAT 規則時發生錯誤"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1918
+#: quantum/plugins/nicira/QuantumPlugin.py:1920
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr "埠 '%s' 未與浮動 IP 產生關聯"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1921
+#: quantum/plugins/nicira/QuantumPlugin.py:1923
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1947
+#: quantum/plugins/nicira/QuantumPlugin.py:1949
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr "Create_l2_gw_service 未傳回所新建資源的 UUID：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1969
+#: quantum/plugins/nicira/QuantumPlugin.py:1971
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7641,75 +7602,75 @@ msgstr "正在儲存新的鑑別 Cookie '%s'"
 msgid "_conn_str() invalid connection type: %s"
 msgstr "_conn_str() 無效的連線類型：%s"
 
-#: quantum/plugins/nicira/api_client/request.py:90
+#: quantum/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr "沒有可用的 API 連線"
 
-#: quantum/plugins/nicira/api_client/request.py:95
+#: quantum/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr "[%(rid)d] 正在發出 - 要求 %(conn)s"
 
-#: quantum/plugins/nicira/api_client/request.py:120
+#: quantum/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr "正在設定 X-Nvp-Wait-For-Config-Generation 要求標頭：'%s'"
 
-#: quantum/plugins/nicira/api_client/request.py:125
+#: quantum/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr "[%(rid)d] 發出要求時發生異常狀況：%(e)s"
 
-#: quantum/plugins/nicira/api_client/request.py:132
+#: quantum/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr "[%(rid)d] 已完成要求 '%(conn)s'：%(status)s（%(sec)0.2f 秒鐘）"
 
-#: quantum/plugins/nicira/api_client/request.py:141
+#: quantum/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr "正在讀取 X-Nvp-config-Generation 回應標頭：'%s'"
 
-#: quantum/plugins/nicira/api_client/request.py:170
+#: quantum/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr "[%d] 已超出重新導向數目上限，正在中止要求"
 
-#: quantum/plugins/nicira/api_client/request.py:180
+#: quantum/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr "[%(rid)d] 正在將要求重新導向至：%(conn)s"
 
-#: quantum/plugins/nicira/api_client/request.py:191
+#: quantum/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr "[%(rid)d] 要求 '%(method) %(url)s' 收到：%(status)s"
 
-#: quantum/plugins/nicira/api_client/request.py:195
+#: quantum/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr "傳回伺服器錯誤：%s"
 
-#: quantum/plugins/nicira/api_client/request.py:199
+#: quantum/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr "無效的伺服器回應"
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: quantum/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr "[%(rid)d] 失敗要求 '%(conn)s'：'%(msg)s'（%(sec)0.2f 秒鐘）"
 
-#: quantum/plugins/nicira/api_client/request.py:236
+#: quantum/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr "[%d] 收到的重新導向狀態沒有位置標頭欄位"
 
-#: quantum/plugins/nicira/api_client/request.py:253
+#: quantum/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr "[%(rid)d] 收到無效的重新導向位置：'%(url)s'"
 
-#: quantum/plugins/nicira/api_client/request.py:257
+#: quantum/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr "[%(rid)d] 收到格式不正確的重新導向位置：%(url)s"
@@ -8735,6 +8696,57 @@ msgstr "找不到 lswitch：%s"
 msgid "lrouter:%s not found"
 msgstr "找不到 lrouter：%s"
 
-#~ msgid "Lifetime of a DHCP lease in seconds"
-#~ msgstr "DHCP 租賃的生命期限（以秒為單位）"
+#~ msgid "The SQLAlchemy connection string used to connect to the database"
+#~ msgstr "用於連接資料庫的 SQLAlchemy 連線字串"
+
+#~ msgid "Database reconnection retry times"
+#~ msgstr "資料庫重新連線重試次數"
+
+#~ msgid "Database reconnection interval in seconds"
+#~ msgstr "資料庫重新連線間隔（以秒為單位）"
+
+#~ msgid "Minimum number of SQL connections to keep open in a pool"
+#~ msgstr "在儲存區中保持開啟的 SQL 連線數目下限"
+
+#~ msgid "Maximum number of SQL connections to keep open in a pool"
+#~ msgstr "在儲存區中保持開啟的 SQL 連線數目上限"
+
+#~ msgid "Timeout in seconds before idle sql connections are reaped"
+#~ msgstr "回收閒置 SQL 連線之前的逾時時間（以秒為單位）"
+
+#~ msgid "Enable the use of eventlet's db_pool for MySQL"
+#~ msgstr "對 MySQL 啟用 eventlet 的 db_pool"
+
+#~ msgid ""
+#~ "Maximum number of SQL connections to "
+#~ "keep open in a QueuePool in "
+#~ "SQLAlchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for max_overflow with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "If set, use this value for pool_timeout with sqlalchemy"
+#~ msgstr ""
+
+#~ msgid "Database server went away"
+#~ msgstr "資料庫伺服器已斷線"
+
+#~ msgid ""
+#~ "Option 'sql_connection' not specified in "
+#~ "any config file - using default "
+#~ "value '%s'"
+#~ msgstr "未在任何配置檔中指定選項 'sql_connection' - 正在使用預設值 '%s'"
+
+#~ msgid "Eventlet connection pooling will not work without python-mysqldb!"
+#~ msgstr "如果未指定 python-mysqldb，則 eventlet 連線儲存區將無法運作！"
+
+#~ msgid "Database connection lost, exit..."
+#~ msgstr "資料庫連線已中斷，結束..."
+
+#~ msgid ""
+#~ "Unable to connect to database, "
+#~ "%(remaining)s attempts left. Retrying in "
+#~ "%(reconnect_interval)s seconds"
+#~ msgstr "無法連接至資料庫，還可以嘗試 %(remaining)s 次。將在 %(reconnect_interval)s 秒鐘後重試"