Imported Translations from Transifex

Change-Id: I63533a673e63caebbf65ad87e71004082066195f

diff --git a/neutron/locale/bg_BG/LC_MESSAGES/neutron.po b/neutron/locale/bg_BG/LC_MESSAGES/neutron.po
index 3550d4031b6f0e3dc19ad82e0cac96987b8f1fb0..2f99ee124c34674cc31daf8e83f4786625327721 100644 (file)
--- a/neutron/locale/bg_BG/LC_MESSAGES/neutron.po
+++ b/neutron/locale/bg_BG/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (Bulgaria) "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/bs/LC_MESSAGES/neutron.po b/neutron/locale/bs/LC_MESSAGES/neutron.po
index f3d1b7e8725b08b5163aacd0de4f6d765b149fb2..268d65c469ab46e0bc9dc07acdb61db3f5f96210 100644 (file)
--- a/neutron/locale/bs/LC_MESSAGES/neutron.po
+++ b/neutron/locale/bs/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bosnian "
@@ -1649,160 +1649,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1810,117 +1810,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3079,10 +3079,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4095,7 +4091,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4103,8 +4099,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4119,25 +4115,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4212,7 +4208,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4313,7 +4309,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4436,75 +4432,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4690,38 +4665,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4730,12 +4705,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6682,118 +6657,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8597,12 +8572,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9194,3 +9169,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/ca/LC_MESSAGES/neutron.po b/neutron/locale/ca/LC_MESSAGES/neutron.po
index df86c17929884cc8091b31b2b32cae74e52d8b42..878b7c92c544d918b1556dc471a1342480a6c185 100644 (file)
--- a/neutron/locale/ca/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ca/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/cs/LC_MESSAGES/neutron.po b/neutron/locale/cs/LC_MESSAGES/neutron.po
index d8ec740411efc2e7f8c3494d4dc5ed6d29e337c8..50f914dc94ad91590e88e89bc65bc727ca0f6da7 100644 (file)
--- a/neutron/locale/cs/LC_MESSAGES/neutron.po
+++ b/neutron/locale/cs/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/da/LC_MESSAGES/neutron.po b/neutron/locale/da/LC_MESSAGES/neutron.po
index 863b593b89cf7b5c4304074473327db9628bb561..3679f9cd0a73fd1987a49066a709ede8bbbf282c 100644 (file)
--- a/neutron/locale/da/LC_MESSAGES/neutron.po
+++ b/neutron/locale/da/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Danish "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/de/LC_MESSAGES/neutron.po b/neutron/locale/de/LC_MESSAGES/neutron.po
index 20a857c5db728c0e8d357a3f28f48e8b2d4e552f..2a0d53bbc92d1da9cf379ed212d909563281436f 100644 (file)
--- a/neutron/locale/de/LC_MESSAGES/neutron.po
+++ b/neutron/locale/de/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-05-22 08:17+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: German "
@@ -1721,82 +1721,82 @@ msgstr ""
 "%(app_name)s kann nicht von Konfigurationsdatei %(config_path)s geladen "
 "werden."
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr "Eine unbekannte Ausnahme ist aufgetreten."
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr "Fehlerhafte %(resource)s-Anfrage: %(msg)s"
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr "Nicht autorisiert."
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr "Der Service ist nicht verfügbar"
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr "Benutzer verfügt nicht über Administrator-Berechtigung: %(reason)s"
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Richtlinie lässt Ausführung von %(action)s nicht zu."
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr "Netz %(net_id)s konnte nicht gefunden werden"
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr "Teilnetz %(subnet_id)s konnte nicht gefunden werden"
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr "Port %(port_id)s konnte nicht auf Netz %(net_id)s gefunden werden"
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr "Policy-Konfiguration 'policy.json' konnte nicht gefunden werden"
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr "Nicht unterstützter Portstatus: %(port_state)s"
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr "Die Ressource ist belegt"
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
@@ -1805,7 +1805,7 @@ msgstr ""
 "Operation auf Netz %(net_id)s kann nicht abgeschlossen werden. Ein oder "
 "mehrere Ports werden im Netz noch verwendet."
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
@@ -1814,7 +1814,7 @@ msgstr ""
 "Operation auf Teilnetz %(subnet_id)s kann nicht abgeschlossen werden. Ein"
 " oder mehrere Ports verfügen über eine IP-Zuordnung von diesem Teilnetz."
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
@@ -1824,7 +1824,7 @@ msgstr ""
 "abgeschlossen werden. Port verfügt bereits über eine angehängte Einheit "
 "%(device_id)s."
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
@@ -1833,7 +1833,7 @@ msgstr ""
 "Operation kann für Netz %(net_id)s nicht abgeschlossen werden. Die MAC-"
 "Adresse %(mac)s ist belegt."
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
@@ -1842,7 +1842,7 @@ msgstr ""
 "Operation kann für %(subnet_id)s nicht abgeschlossen werden. Die Anzahl "
 "an Hostroutes überschreitet den Grenzwert %(quota)s."
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
@@ -1851,7 +1851,7 @@ msgstr ""
 "Operation kann für %(subnet_id)s nicht abgeschlossen werden. Die Anzahl "
 "an DNS-Namensservern überschreitet den Grenzwert %(quota)s."
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
@@ -1860,7 +1860,7 @@ msgstr ""
 "Operation kann für Netz %(net_id)s nicht abgeschlossen werden. Die IP-"
 "Adresse %(ip_address)s ist belegt."
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
@@ -1869,7 +1869,7 @@ msgstr ""
 "Das Netz kann nicht erstellt werden. Das VLAN %(vlan_id)s auf dem "
 "physischen Netz %(physical_network)s ist belegt."
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
@@ -1878,18 +1878,18 @@ msgstr ""
 "Das einfache Netz kann nicht erstellt werden. Das physische Netz "
 "%(physical_network)s ist belegt."
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 "Das Netz kann nicht erstellt werden. Die Tunnel-ID %(tunnel_id)s ist "
 "belegt."
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr "Erstellung von Nutzernetzen ist nicht aktiviert."
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
@@ -1897,7 +1897,7 @@ msgstr ""
 "Das Netz kann nicht erstellt werden. Es ist kein Nutzernetz für die "
 "Zuordnung verfügbar."
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1908,7 +1908,7 @@ msgstr ""
 "%(net_id)s verbunden werden. Die Zusatzeinheit ist bereits mit Port "
 "%(att_port_id)s verbunden"
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
@@ -1917,22 +1917,22 @@ msgstr ""
 "Teilnetz auf Port %(port_id)s stimmt nicht mit dem angeforderten Teilnetz"
 " %(subnet_id)s überein"
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr "Fehlerhafter Anforderungshauptteil: %(reason)s"
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr "Ungültige Eingabe für Operation: %(error_message)s."
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr "Der Zuordnungspool %(pool)s ist nicht gültig."
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
@@ -1941,52 +1941,52 @@ msgstr ""
 "Überschneidung bei Zuordnungspools %(pool_1)s %(pool_2)s für Teilnetz "
 "%(subnet_cidr)s gefunden. "
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 "Der Zuordnungspool %(pool)s geht über das Teilnetz-CIDR %(subnet_cidr)s "
 "hinaus."
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr "Eindeutige MAC-Adresse kann auf Netz %(net_id)s nicht generiert werden."
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr "Keine weiteren IP-Adressen auf Netz %(net_id)s verfügbar."
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr "Brücke %(bridge)s ist nicht vorhanden."
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr "Erstellung fehlgeschlagen. %(dev_name)s ist bereits vorhanden."
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr "Sudo-Berechtigung ist zum Ausführen dieses Befehls erforderlich."
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr "Unbekannte Quotenressourcen %(unknown)s."
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Quote für Ressourcen überschritten: %(overs)s"
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr "Nutzer-ID aus Quotenanforderung hat gefehlt"
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
@@ -1995,7 +1995,7 @@ msgstr ""
 "Durch die Änderung wäre die Nutzung kleiner als 0 für die folgenden "
 "Ressourcen: %(unders)s"
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
@@ -2004,31 +2004,31 @@ msgstr ""
 "Freigabeeinstellungen für Netz %(network)s können nicht rekonfiguriert "
 "werden. Mehrere Nutzer verwenden es."
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr "Ungültige Erweiterungsumgebung: %(reason)s"
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, fuzzy, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr "Es können keine IP-Adressen auf externem Netz gefunden werden"
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr "Es sind mehrere externe Netze vorhanden"
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr "Ein ungültiger Wert wurde für %(opt_name)s angegeben: %(opt_value)s"
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr "Gateway-IP '%(ip_address)s' steht im Konflikt mit Zuordnungspool %(pool)s"
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3289,10 +3289,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr "Nicht abgefangene Ausnahme"
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4355,7 +4351,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4363,8 +4359,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr "Details für Gerät %(device)s von %(agent_id)s angefordert"
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4379,25 +4375,25 @@ msgstr "Details für Gerät %(device)s von %(agent_id)s angefordert"
 msgid "%s can not be found in database"
 msgstr "%s kann in Datenbank nicht gefunden werden"
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr "Treiber für Brocade-Netzbetriebssystem:"
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr "Das zugeordnete VLAN (%d) wird in den Pool zurückgegeben"
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr "Zugeordnetes VLAN (%d) aus dem Pool"
@@ -4472,7 +4468,7 @@ msgid "delete_subnet() called"
 msgstr "Aufruf von 'delete_subnet()'"
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr "Aufruf von 'get_all_qoss()'"
 
@@ -4583,10 +4579,8 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
-"Berechtigungsnachweis %(credential_id)s ist für Nutzer %(tenant_id)s "
-"bereits vorhanden"
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
@@ -4708,75 +4702,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr "Aufruf von 'get_all_vlanids()'"
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr "Aufruf von 'is_vlanid_used()'"
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr "Aufruf von 'release_vlanid()'"
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr "Aufruf von 'delete_vlanid()'"
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr "Aufruf von 'reserve_vlanid()'"
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr "Aufruf von 'get_qos()'"
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr "Aufruf von 'add_qos()'"
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr "Aufruf von 'get_all_nexusport_bindings()'"
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr "Aufruf von 'get_nexusport_binding()'"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr "Aufruf von 'get_nexusvlan_binding()'"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr "Aufruf von 'add_nexusport_binding()'"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr "Aufruf von 'remove_nexusport_binding()'"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr "Aufruf von 'update_nexusport_binding'"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr "Aufruf von 'get_nexusvm_binding()'"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr "Aufruf von 'get_port_vlan_switch_binding()'"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4970,38 +4943,38 @@ msgstr ""
 "Entfernen von VLAN %(vlan_id)s auf physischem Netz %(physical_network)s "
 "von Pool "
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr "Netztyp für Nutzernetze ('local', 'flat', 'vlan' oder 'none')"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr "Liste mit <physical_network>:<vlan_min>:<vlan_max> oder <physical_network>"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr "'segmentation_id' für %s-Netz angegeben"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr "'physical_network' für %s-Netz angegeben"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr "'physical_network' nicht angegeben"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr "Ungültiger Wert für 'tenant_network_type': %s. Agent beendet!"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -5010,12 +4983,12 @@ msgstr "Ungültiger Wert für 'tenant_network_type': %s. Agent beendet!"
 msgid "Network VLAN ranges: %s"
 msgstr "Bereiche für Netz-VLAN: %s"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr "Netztyp %s nicht unterstützt"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -7053,100 +7026,100 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 "'activate_port_if_ready()': überspringen, 'port.admin_state_up' ist "
 "'False'."
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 "'activate_port_if_ready()': überspringen, 'network.admin_state_up' ist "
 "'False'."
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 "'activate_port_if_ready()': überspringen, keine Portinformationen für "
 "diesen Port."
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 "'activate_port_if_ready()': überspringen, 'ofc_port' ist bereits "
 "vorhanden."
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr "'create_ofc_port()' fehlgeschlagen. Grund: %s"
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr "'delete_ofc_port()' fehlgeschlagen. Grund: %s"
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr "'deactivate_port()': überspringen, 'ofc_port' ist nicht vorhanden."
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr "Aufruf von 'NECPluginV2.create_network()', network=%s ."
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr "'create_network()' fehlgeschlagen. Grund: %s"
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr "Aufruf von 'NECPluginV2.update_network()', id=%(id)s network=%(network)s ."
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr "Aufruf von 'NECPluginV2.delete_network()', id=%s ."
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr "'delete_network()' fehlgeschlagen. Grund: %s"
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr "'delete_ofc_tenant()' fehlgeschlagen. Grund: %s"
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr "Aufruf von 'NECPluginV2.create_port()', port=%s ."
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr "Aufruf von 'NECPluginV2.update_port()', id=%(id)s port=%(port)s ."
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr "Aufruf von 'NECPluginV2.delete_port()', id=%s ."
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
@@ -7155,26 +7128,26 @@ msgstr ""
 "Aufruf von 'NECPluginV2RPCCallbacks.get_port_from_device()', "
 "device=%(device)s => %(ret)s."
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr "Aufruf von 'NECPluginV2RPCCallbacks.update_ports()', kwargs=%s ."
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -9121,12 +9094,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr "Fehler beim Überprüfen des Status vom Netzadministrator:"
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr "get_ofp_rest_api: %s"
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr "Ungültige Konfiguration. 'ryu.ini' überprüfen"
 
@@ -9726,3 +9699,29 @@ msgstr "lRouter: %s nicht gefunden"
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr "Nicht abgefangene Ausnahme"
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+#~ "Berechtigungsnachweis %(credential_id)s ist für "
+#~ "Nutzer %(tenant_id)s bereits vorhanden"
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr "Aufruf von 'get_all_vlanids()'"
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr "Aufruf von 'is_vlanid_used()'"
+
+#~ msgid "release_vlanid() called"
+#~ msgstr "Aufruf von 'release_vlanid()'"
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr "Aufruf von 'delete_vlanid()'"
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr "Aufruf von 'reserve_vlanid()'"
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr "Aufruf von 'get_all_nexusport_bindings()'"
+

diff --git a/neutron/locale/en_AU/LC_MESSAGES/neutron.po b/neutron/locale/en_AU/LC_MESSAGES/neutron.po
index 189ba22fd97448f912725ece605dce264499467a..76a29ed7da63d8346524ff40d472ab4b03523814 100644 (file)
--- a/neutron/locale/en_AU/LC_MESSAGES/neutron.po
+++ b/neutron/locale/en_AU/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (Australia) "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/en_GB/LC_MESSAGES/neutron.po b/neutron/locale/en_GB/LC_MESSAGES/neutron.po
index d14e4dd735ec9a2cac0027a5f9f6b2e0148cc457..523f11e2b2e27ac4f63ad8810d274cafdc1ae833 100644 (file)
--- a/neutron/locale/en_GB/LC_MESSAGES/neutron.po
+++ b/neutron/locale/en_GB/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United Kingdom) "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/en_US/LC_MESSAGES/neutron.po b/neutron/locale/en_US/LC_MESSAGES/neutron.po
index 513106106fe56866979dfbfab9bc7314ea2e0629..a23abb2f36b6fe0d7845a5bc775028794eaf66fe 100644 (file)
--- a/neutron/locale/en_US/LC_MESSAGES/neutron.po
+++ b/neutron/locale/en_US/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United States) "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/es/LC_MESSAGES/neutron.po b/neutron/locale/es/LC_MESSAGES/neutron.po
index b2ce88a548405113e9b17190cdfbbe0fdefb0012..63a013323fc75077df2f29ae3b90302f4cde28a4 100644 (file)
--- a/neutron/locale/es/LC_MESSAGES/neutron.po
+++ b/neutron/locale/es/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/fi_FI/LC_MESSAGES/neutron.po b/neutron/locale/fi_FI/LC_MESSAGES/neutron.po
index 6b2f1e63d2f1af03085971f10b0f67764b31d121..dde7c55e51856d17f3d30307ad14f8c8437ea1fc 100644 (file)
--- a/neutron/locale/fi_FI/LC_MESSAGES/neutron.po
+++ b/neutron/locale/fi_FI/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish (Finland) "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/fr/LC_MESSAGES/neutron.po b/neutron/locale/fr/LC_MESSAGES/neutron.po
index 03d77940c405c8618bf1d5031b4d8775ad4e4709..46f447a8ce8e34cd715902977edc61496ea5a788 100644 (file)
--- a/neutron/locale/fr/LC_MESSAGES/neutron.po
+++ b/neutron/locale/fr/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/hr/LC_MESSAGES/neutron.po b/neutron/locale/hr/LC_MESSAGES/neutron.po
index 231ead8696ab9c0444689921a5dd102f4a447260..4fcfe056830076691a21072e70fcb7d610882ed1 100644 (file)
--- a/neutron/locale/hr/LC_MESSAGES/neutron.po
+++ b/neutron/locale/hr/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Croatian "
@@ -1649,160 +1649,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1810,117 +1810,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3079,10 +3079,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4095,7 +4091,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4103,8 +4099,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4119,25 +4115,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4212,7 +4208,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4313,7 +4309,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4436,75 +4432,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4690,38 +4665,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4730,12 +4705,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6682,118 +6657,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8597,12 +8572,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9194,3 +9169,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/hu/LC_MESSAGES/neutron.po b/neutron/locale/hu/LC_MESSAGES/neutron.po
index ae6a6e61350649af64c4501715eafd84852157db..67e633483cd1e7af85c20aeba700d5d21ec36e1a 100644 (file)
--- a/neutron/locale/hu/LC_MESSAGES/neutron.po
+++ b/neutron/locale/hu/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hungarian "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/id/LC_MESSAGES/neutron.po b/neutron/locale/id/LC_MESSAGES/neutron.po
index 82d71127ba2bfec99eb083db3054a1ec249e2dd8..226bb398358f9081e02df42dedbeb9c03f7a7713 100644 (file)
--- a/neutron/locale/id/LC_MESSAGES/neutron.po
+++ b/neutron/locale/id/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/it/LC_MESSAGES/neutron.po b/neutron/locale/it/LC_MESSAGES/neutron.po
index e322cfcce5422581bdd2610a36d812cfe0640921..2f0aa2de01d3f6389932bc61354d8d430ead2465 100644 (file)
--- a/neutron/locale/it/LC_MESSAGES/neutron.po
+++ b/neutron/locale/it/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/it_IT/LC_MESSAGES/neutron.po b/neutron/locale/it_IT/LC_MESSAGES/neutron.po
index 66dd86d7caf05d4b3cb95e1b36183719b4b04a71..7bc04675b6f39f5e922936eba1cbbed7e5c52fab 100644 (file)
--- a/neutron/locale/it_IT/LC_MESSAGES/neutron.po
+++ b/neutron/locale/it_IT/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Italian (Italy) "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/ja/LC_MESSAGES/neutron.po b/neutron/locale/ja/LC_MESSAGES/neutron.po
index edd0eef9ac891fc9ee25f9d8d5c3290c93cc3750..3cb47f0236bf2ed6eb7e087a1761f20b3b8b39a9 100644 (file)
--- a/neutron/locale/ja/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ja/LC_MESSAGES/neutron.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-30 10:28+0000\n"
 "Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
 "Language-Team: Japanese "
@@ -1649,160 +1649,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1810,117 +1810,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3079,10 +3079,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4095,7 +4091,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4103,8 +4099,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4119,25 +4115,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4212,7 +4208,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4313,7 +4309,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4436,75 +4432,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4690,38 +4665,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4730,12 +4705,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6682,118 +6657,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8597,12 +8572,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9194,3 +9169,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/ka_GE/LC_MESSAGES/neutron.po b/neutron/locale/ka_GE/LC_MESSAGES/neutron.po
index ef50d00eb517cff49a9dbf1f2f687a36bf756141..c37f8a2d36a97413b79238b06994cfa7fb9db248 100644 (file)
--- a/neutron/locale/ka_GE/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ka_GE/LC_MESSAGES/neutron.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+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"
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr "არ არის ავტორიზებული."
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr "სერვისი მიუწვდომელია"
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr "რესურსი გამოყენებულია"
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6682,118 +6657,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8597,12 +8572,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9194,3 +9169,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/ko/LC_MESSAGES/neutron.po b/neutron/locale/ko/LC_MESSAGES/neutron.po
index e506af293a796199bda137bfcf346d246a1912da..c5a132b0fa4044f98b12f0da270a482c28cff3ec 100644 (file)
--- a/neutron/locale/ko/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ko/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Korean "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/ko_KR/LC_MESSAGES/neutron.po b/neutron/locale/ko_KR/LC_MESSAGES/neutron.po
index 8f6cfdf705fd7f7ecb89ec0ef7bc3837498bf7b5..7518ad2e3502de68511148c7d5432c46e6063bd7 100644 (file)
--- a/neutron/locale/ko_KR/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ko_KR/LC_MESSAGES/neutron.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+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"
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/ms/LC_MESSAGES/neutron.po b/neutron/locale/ms/LC_MESSAGES/neutron.po
index e05f567cb73883e5bee5957a3c4b8f3b11cd71d2..e3c5b9783376ba2d70dea7722710c34978a6ef7a 100644 (file)
--- a/neutron/locale/ms/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ms/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Malay "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/nb/LC_MESSAGES/neutron.po b/neutron/locale/nb/LC_MESSAGES/neutron.po
index 191605d0f4a68321bf78d1719ed8fb3fff687878..70903bc48829ca08193882b53936fbb2917791b5 100644 (file)
--- a/neutron/locale/nb/LC_MESSAGES/neutron.po
+++ b/neutron/locale/nb/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmål "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/neutron.pot b/neutron/locale/neutron.pot
index cded10a61e2d18e3269a0d9ac1baea48a802ebc7..5be291304f0802e12276d5ba40dc76fb33f85330 100644 (file)
--- a/neutron/locale/neutron.pot
+++ b/neutron/locale/neutron.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron jenkins.neutron.propose.translation.update.36"
+"Project-Id-Version: neutron jenkins.neutron.propose.translation.update.37"
 "\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+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"
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 

diff --git a/neutron/locale/nl_NL/LC_MESSAGES/neutron.po b/neutron/locale/nl_NL/LC_MESSAGES/neutron.po
index 2cc02f8f21b02022393c1f79d24628ef33c0e36b..dccb65cefff42b8eef39a24ff326fd9a997817cb 100644 (file)
--- a/neutron/locale/nl_NL/LC_MESSAGES/neutron.po
+++ b/neutron/locale/nl_NL/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch (Netherlands) "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/pl_PL/LC_MESSAGES/neutron.po b/neutron/locale/pl_PL/LC_MESSAGES/neutron.po
index 295a4cf78cfd0251cf7580818c52e71a3e147b36..1a7a23525ae78d3b8308022757678e924d67ef76 100644 (file)
--- a/neutron/locale/pl_PL/LC_MESSAGES/neutron.po
+++ b/neutron/locale/pl_PL/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-06-28 06:06+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Polish (Poland) "
@@ -1649,160 +1649,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1810,117 +1810,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3079,10 +3079,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4095,7 +4091,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4103,8 +4099,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4119,25 +4115,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4212,7 +4208,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4313,7 +4309,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4436,75 +4432,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4690,38 +4665,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4730,12 +4705,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6682,118 +6657,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8597,12 +8572,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9194,3 +9169,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/pt/LC_MESSAGES/neutron.po b/neutron/locale/pt/LC_MESSAGES/neutron.po
index 264e92e227a48b2a2f36e7495b4ac3b5676905e7..12efccd1bcdd7166edf9bce0731890755ef5b4c7 100644 (file)
--- a/neutron/locale/pt/LC_MESSAGES/neutron.po
+++ b/neutron/locale/pt/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/pt_BR/LC_MESSAGES/neutron.po b/neutron/locale/pt_BR/LC_MESSAGES/neutron.po
index 6e5f800b413afd73677edd6fa2bc481d55955e31..b6e2324d5c29261b4f8c420e1a58a57c9c14c0a5 100644 (file)
--- a/neutron/locale/pt_BR/LC_MESSAGES/neutron.po
+++ b/neutron/locale/pt_BR/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese (Brazil) "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/ro/LC_MESSAGES/neutron.po b/neutron/locale/ro/LC_MESSAGES/neutron.po
index c8a0a750994a8f60b07c9d833fcee2a15ac5f364..903480e038b2b74b38dc80212f8df26b32cbe798 100644 (file)
--- a/neutron/locale/ro/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ro/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-06-08 07:51+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Romanian "
@@ -1649,160 +1649,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1810,117 +1810,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3079,10 +3079,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4095,7 +4091,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4103,8 +4099,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4119,25 +4115,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4212,7 +4208,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4313,7 +4309,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4436,75 +4432,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4690,38 +4665,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4730,12 +4705,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6682,118 +6657,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8597,12 +8572,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9194,3 +9169,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/ru/LC_MESSAGES/neutron.po b/neutron/locale/ru/LC_MESSAGES/neutron.po
index c36be85e90caae711386289a02a9b3a1cebcef43..95c83f2450ade538cb55e837d3a9e4dce14c7e91 100644 (file)
--- a/neutron/locale/ru/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ru/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian "
@@ -1649,160 +1649,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1810,117 +1810,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3079,10 +3079,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4095,7 +4091,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4103,8 +4099,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4119,25 +4115,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4212,7 +4208,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4313,7 +4309,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4436,75 +4432,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4690,38 +4665,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4730,12 +4705,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6682,118 +6657,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8597,12 +8572,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9194,3 +9169,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/ru_RU/LC_MESSAGES/neutron.po b/neutron/locale/ru_RU/LC_MESSAGES/neutron.po
index dc5c20aab22fceb913bb29036fdece39092664ce..179c0ce5af260c578b56ce3fb7539da25d1ba3c3 100644 (file)
--- a/neutron/locale/ru_RU/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ru_RU/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian (Russia) "
@@ -1649,160 +1649,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1810,117 +1810,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3079,10 +3079,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4095,7 +4091,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4103,8 +4099,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4119,25 +4115,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4212,7 +4208,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4313,7 +4309,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4436,75 +4432,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4690,38 +4665,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4730,12 +4705,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6682,118 +6657,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8597,12 +8572,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9194,3 +9169,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/sl_SI/LC_MESSAGES/neutron.po b/neutron/locale/sl_SI/LC_MESSAGES/neutron.po
index 6037308bb3d52601dd2027a87b2271810aaf1663..a679898d14b4754efb918f307218c7321eba7967 100644 (file)
--- a/neutron/locale/sl_SI/LC_MESSAGES/neutron.po
+++ b/neutron/locale/sl_SI/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-06-28 06:06+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Slovenian (Slovenia) "
@@ -1649,160 +1649,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1810,117 +1810,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3079,10 +3079,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4095,7 +4091,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4103,8 +4099,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4119,25 +4115,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4212,7 +4208,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4313,7 +4309,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4436,75 +4432,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4690,38 +4665,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4730,12 +4705,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6682,118 +6657,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8597,12 +8572,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9194,3 +9169,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/sw_KE/LC_MESSAGES/neutron.po b/neutron/locale/sw_KE/LC_MESSAGES/neutron.po
index f8c126e807816337d24d2ac75683a7296cabd0ac..d8b602cec3476db624a43c1a6828fb475bd185c4 100644 (file)
--- a/neutron/locale/sw_KE/LC_MESSAGES/neutron.po
+++ b/neutron/locale/sw_KE/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swahili (Kenya) "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/tl/LC_MESSAGES/neutron.po b/neutron/locale/tl/LC_MESSAGES/neutron.po
index 26f77c46cd1299553599a5fe3e22a9e37c74f4f0..1c25fbcb6d6678700908773e59b7ae39a8c056ac 100644 (file)
--- a/neutron/locale/tl/LC_MESSAGES/neutron.po
+++ b/neutron/locale/tl/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Tagalog "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/tr_TR/LC_MESSAGES/neutron.po b/neutron/locale/tr_TR/LC_MESSAGES/neutron.po
index 793d7a041c2648452f2155c466822907c9cdf9ff..bcc14cb4f8d079c9b1e21190e26db82d30ba54aa 100644 (file)
--- a/neutron/locale/tr_TR/LC_MESSAGES/neutron.po
+++ b/neutron/locale/tr_TR/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish (Turkey) "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/uk/LC_MESSAGES/neutron.po b/neutron/locale/uk/LC_MESSAGES/neutron.po
index bece03f82c8397bc45c08dabb6db86e515d1c013..72ddb25a5a4ae476734679ac378335b36da7c9b9 100644 (file)
--- a/neutron/locale/uk/LC_MESSAGES/neutron.po
+++ b/neutron/locale/uk/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Ukrainian "
@@ -1649,160 +1649,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1810,117 +1810,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3079,10 +3079,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4095,7 +4091,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4103,8 +4099,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4119,25 +4115,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4212,7 +4208,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4313,7 +4309,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4436,75 +4432,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4690,38 +4665,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4730,12 +4705,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6682,118 +6657,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8597,12 +8572,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9194,3 +9169,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/vi_VN/LC_MESSAGES/neutron.po b/neutron/locale/vi_VN/LC_MESSAGES/neutron.po
index 3fcee3c0dc8184a2d7b18725fe563491d7221891..31b6981f5a43dbafc2d65efb55c509b0fad91279 100644 (file)
--- a/neutron/locale/vi_VN/LC_MESSAGES/neutron.po
+++ b/neutron/locale/vi_VN/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/zh_CN/LC_MESSAGES/neutron.po b/neutron/locale/zh_CN/LC_MESSAGES/neutron.po
index ad1f7a706cd9dff5459fb5541c502c2aacb5e385..dd3d120de601ee6f15170d411fb4711e83fc3bb5 100644 (file)
--- a/neutron/locale/zh_CN/LC_MESSAGES/neutron.po
+++ b/neutron/locale/zh_CN/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/zh_HK/LC_MESSAGES/neutron.po b/neutron/locale/zh_HK/LC_MESSAGES/neutron.po
index cfb865b87fccc0b7328ad17e5772b87b5afda32f..e9ed9acd942629a2c0026cff874e21a3f3769bcd 100644 (file)
--- a/neutron/locale/zh_HK/LC_MESSAGES/neutron.po
+++ b/neutron/locale/zh_HK/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Hong Kong) "
@@ -1648,160 +1648,160 @@ msgstr ""
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1809,117 +1809,117 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3078,10 +3078,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr ""
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4094,7 +4090,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4102,8 +4098,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4118,25 +4114,25 @@ msgstr ""
 msgid "%s can not be found in database"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
@@ -4211,7 +4207,7 @@ msgid "delete_subnet() called"
 msgstr ""
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr ""
 
@@ -4312,7 +4308,7 @@ msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
@@ -4435,75 +4431,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr ""
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr ""
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4689,38 +4664,38 @@ msgid ""
 "pool"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4729,12 +4704,12 @@ msgstr ""
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6681,118 +6656,118 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8596,12 +8571,12 @@ msgstr ""
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
@@ -9193,3 +9168,27 @@ msgstr ""
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr ""
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr ""
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr ""
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr ""
+
+#~ msgid "release_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr ""
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr ""
+

diff --git a/neutron/locale/zh_TW/LC_MESSAGES/neutron.po b/neutron/locale/zh_TW/LC_MESSAGES/neutron.po
index 4e1b2e6e76af26097a58c28608186ed1035f3ca9..b7456b7bcee858f3e42ae807aca77a23ac4f5f90 100644 (file)
--- a/neutron/locale/zh_TW/LC_MESSAGES/neutron.po
+++ b/neutron/locale/zh_TW/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-08-07 06:14+0000\n"
+"POT-Creation-Date: 2013-08-07 19:56+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) "
@@ -1655,160 +1655,160 @@ msgstr "配置貼上檔案：%s"
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr "無法從配置檔 %(config_path)s 載入 %(app_name)s。"
 
-#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:213
+#: neutron/common/exceptions.py:32 neutron/plugins/nicira/NvpApiClient.py:213
 msgid "An unknown exception occurred."
 msgstr "發生不明異常狀況。"
 
-#: neutron/common/exceptions.py:38
+#: neutron/common/exceptions.py:46
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr "錯誤的 %(resource)s 要求：%(msg)s"
 
-#: neutron/common/exceptions.py:50
+#: neutron/common/exceptions.py:58
 msgid "Not authorized."
 msgstr "未獲授權。"
 
-#: neutron/common/exceptions.py:54
+#: neutron/common/exceptions.py:62
 msgid "The service is unailable"
 msgstr "服務無法使用"
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr "使用者沒有管理者專用權：%(reason)s"
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "原則不容許執行 %(action)s。"
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr "找不到網路 %(net_id)s"
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr "找不到子網路 %(subnet_id)s"
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr "在網路 %(net_id)s 上找不到埠 %(port_id)s"
 
-#: neutron/common/exceptions.py:83
+#: neutron/common/exceptions.py:91
 msgid "Policy configuration policy.json could not be found"
 msgstr "找不到原則配置 policy.json 檔"
 
-#: neutron/common/exceptions.py:87
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr "不支援的埠狀態：%(port_state)s"
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:111
 msgid "The resource is inuse"
 msgstr "資源已在使用中"
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:115
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr "無法對網路 %(net_id)s 完成作業。網路上有一個以上的埠仍在使用中。"
 
-#: neutron/common/exceptions.py:112
+#: neutron/common/exceptions.py:120
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr "無法對子網路 %(subnet_id)s 完成作業。一個以上的埠具有從此子網路配置的 IP。"
 
-#: neutron/common/exceptions.py:117
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr "無法對網路 %(net_id)s 的埠 %(port_id)s 完成作業。埠已連接了裝置 %(device_id)s。"
 
-#: neutron/common/exceptions.py:123
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr "無法對網路 %(net_id)s 完成作業。MAC 位址 %(mac)s 正在使用中。"
 
-#: neutron/common/exceptions.py:129
+#: neutron/common/exceptions.py:137
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr "無法對 %(subnet_id)s 完成作業。主機路徑數目超出限制 %(quota)s。"
 
-#: neutron/common/exceptions.py:135
+#: neutron/common/exceptions.py:143
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr "無法對 %(subnet_id)s 完成作業。DNS 名稱伺服器的數目超出限制 %(quota)s。"
 
-#: neutron/common/exceptions.py:140
+#: neutron/common/exceptions.py:148
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr "無法對網路 %(net_id)s 完成作業。IP 位址 %(ip_address)s 正在使用中。"
 
-#: neutron/common/exceptions.py:145
+#: neutron/common/exceptions.py:153
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr "無法建立網路。實體網路 %(physical_network)s 上的 VLAN %(vlan_id)s 正在使用中。"
 
-#: neutron/common/exceptions.py:151
+#: neutron/common/exceptions.py:159
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr "無法建立平面網路。實體網路 %(physical_network)s 正在使用中。"
 
-#: neutron/common/exceptions.py:156
+#: neutron/common/exceptions.py:164
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr "無法建立網路。通道 ID %(tunnel_id)s 正在使用中。"
 
-#: neutron/common/exceptions.py:161
+#: neutron/common/exceptions.py:169
 msgid "Tenant network creation is not enabled."
 msgstr "未啟用 Tenant 網路建立作業。"
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:177
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr "無法建立網路。沒有可用於配置的 Tenant 網路。"
 
-#: neutron/common/exceptions.py:174
+#: neutron/common/exceptions.py:182
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1818,117 +1818,117 @@ msgstr ""
 "無法將連接裝置 %(att_id)s 插入網路 %(net_id)s 的埠 %(port_id)s。該連接裝置已插入埠 "
 "%(att_port_id)s"
 
-#: neutron/common/exceptions.py:180
+#: neutron/common/exceptions.py:188
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr "埠 %(port_id)s 上的子網路與所要求的子網路 %(subnet_id)s 不符"
 
-#: neutron/common/exceptions.py:185
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr "要求內文的格式不正確：%(reason)s"
 
-#: neutron/common/exceptions.py:193
+#: neutron/common/exceptions.py:203
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr "作業的輸入無效：%(error_message)s。"
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:207
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr "配置儲存區 %(pool)s 無效。"
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr "發現子網路 %(subnet_cidr)s 的配置儲存區 %(pool_1)s 及 %(pool_2)s 重疊。"
 
-#: neutron/common/exceptions.py:206
+#: neutron/common/exceptions.py:216
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr "配置儲存區 %(pool)s 跨越了子網路 CIDR %(subnet_cidr)s。"
 
-#: neutron/common/exceptions.py:215
+#: neutron/common/exceptions.py:221
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr "無法在網路 %(net_id)s 上產生唯一 MAC 位址。"
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:225
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr "網路 %(net_id)s 上沒有更多的可用 IP 位址。"
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:229
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr "橋接器 %(bridge)s 不存在。"
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:233
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr "建立失敗。%(dev_name)s 已存在。"
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:237
 msgid "Sudo priviledge is required to run this command."
 msgstr "需要 Sudo 專用權才能執行此指令。"
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:241
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr "不明的配額資源 %(unknown)s。"
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:245
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "資源已超出配額：%(overs)s"
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:249
 msgid "Tenant-id was missing from Quota request"
 msgstr "Quota 要求中遺漏了 Tenant-id"
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr "變更會使下列資源的用量小於 0：%(unders)s"
 
-#: neutron/common/exceptions.py:252
+#: neutron/common/exceptions.py:258
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr "無法給網路 %(network)s 重新配置共用設定。多個 Tenant 正在使用該網路"
 
-#: neutron/common/exceptions.py:257
+#: neutron/common/exceptions.py:263
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr "無效的延伸環境：%(reason)s"
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:271
 #, fuzzy, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr "在外部網路上找不到任何 IP 位址"
 
-#: neutron/common/exceptions.py:266
+#: neutron/common/exceptions.py:276
 msgid "More than one external network exists"
 msgstr "多個外部網路已存在"
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:280
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr "提供給 %(opt_name)s 的值 %(opt_value)s 無效"
 
-#: neutron/common/exceptions.py:275
+#: neutron/common/exceptions.py:285
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr "閘道 IP %(ip_address)s 與配置儲存區 %(pool)s 相衝突"
 
-#: neutron/common/exceptions.py:280
+#: neutron/common/exceptions.py:290
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
@@ -3095,10 +3095,6 @@ msgstr ""
 msgid "IPsecPolicy %(ipsecpolicy_id)s is still in use"
 msgstr ""
 
-#: neutron/openstack/common/exception.py:104
-msgid "Uncaught exception"
-msgstr "未捕捉到的異常狀況"
-
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -4117,7 +4113,7 @@ msgstr ""
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:124
+#: neutron/plugins/brocade/NeutronPlugin.py:125
 #: neutron/plugins/hyperv/rpc_callbacks.py:53
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:96
@@ -4125,8 +4121,8 @@ msgstr ""
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr "從 %(agent_id)s 要求的裝置 %(device)s 詳細資料"
 
-#: neutron/plugins/brocade/NeutronPlugin.py:138
-#: neutron/plugins/brocade/NeutronPlugin.py:155
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
 #: neutron/plugins/hyperv/rpc_callbacks.py:69
 #: neutron/plugins/hyperv/rpc_callbacks.py:88
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
@@ -4141,25 +4137,25 @@ msgstr "從 %(agent_id)s 要求的裝置 %(device)s 詳細資料"
 msgid "%s can not be found in database"
 msgstr "在資料庫中找不到 %s"
 
-#: neutron/plugins/brocade/NeutronPlugin.py:284
-#: neutron/plugins/brocade/NeutronPlugin.py:327
-#: neutron/plugins/brocade/NeutronPlugin.py:377
+#: neutron/plugins/brocade/NeutronPlugin.py:288
+#: neutron/plugins/brocade/NeutronPlugin.py:331
+#: neutron/plugins/brocade/NeutronPlugin.py:384
 msgid "Brocade NOS driver:"
 msgstr "Brocade NOS 驅動程式："
 
-#: neutron/plugins/brocade/NeutronPlugin.py:285
-#: neutron/plugins/brocade/NeutronPlugin.py:328
-#: neutron/plugins/brocade/NeutronPlugin.py:378
+#: neutron/plugins/brocade/NeutronPlugin.py:289
+#: neutron/plugins/brocade/NeutronPlugin.py:332
+#: neutron/plugins/brocade/NeutronPlugin.py:385
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: neutron/plugins/brocade/NeutronPlugin.py:286
+#: neutron/plugins/brocade/NeutronPlugin.py:290
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr "正在將已配置的 VLAN (%d) 傳回給儲存區"
 
-#: neutron/plugins/brocade/NeutronPlugin.py:294
+#: neutron/plugins/brocade/NeutronPlugin.py:298
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr "已從儲存區配置 VLAN (%d)"
@@ -4234,7 +4230,7 @@ msgid "delete_subnet() called"
 msgstr "已呼叫 delete_subnet()"
 
 #: neutron/plugins/cisco/network_plugin.py:278
-#: neutron/plugins/cisco/db/network_db_v2.py:109
+#: neutron/plugins/cisco/db/network_db_v2.py:38
 msgid "get_all_qoss() called"
 msgstr "已呼叫 get_all_qoss()"
 
@@ -4335,8 +4331,8 @@ msgstr "找不到 Tenant %(tenant_id)s 的認證 %(credential_name)s"
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
-msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
-msgstr "Tenant %(tenant_id)s 的認證 %(credential_id)s 已存在"
+msgid "Credential %(credential_name)s already exists for tenant %(tenant_id)s"
+msgstr ""
 
 #: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
@@ -4458,75 +4454,54 @@ msgstr ""
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: neutron/plugins/cisco/db/network_db_v2.py:34
-#: neutron/plugins/cisco/db/network_db_v2.py:101
-msgid "get_all_vlanids() called"
-msgstr "已呼叫 get_all_vlanids()"
-
-#: neutron/plugins/cisco/db/network_db_v2.py:41
-msgid "is_vlanid_used() called"
-msgstr "已呼叫 is_vlanid_used()"
-
-#: neutron/plugins/cisco/db/network_db_v2.py:53
-msgid "release_vlanid() called"
-msgstr "已呼叫 release_vlanid()"
-
-#: neutron/plugins/cisco/db/network_db_v2.py:68
-msgid "delete_vlanid() called"
-msgstr "已呼叫 delete_vlanid()"
-
-#: neutron/plugins/cisco/db/network_db_v2.py:82
-msgid "reserve_vlanid() called"
-msgstr "已呼叫 reserve_vlanid()"
-
-#: neutron/plugins/cisco/db/network_db_v2.py:117
+#: neutron/plugins/cisco/db/network_db_v2.py:46
 msgid "get_qos() called"
 msgstr "已呼叫 get_qos()"
 
-#: neutron/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/network_db_v2.py:60
 msgid "add_qos() called"
 msgstr "已呼叫 add_qos()"
 
 #: neutron/plugins/cisco/db/nexus_db_v2.py:34
-msgid "get_all_nexusport_bindings() called"
-msgstr "已呼叫 get_all_nexusport_bindings()"
-
-#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr "已呼叫 get_nexusport_binding()"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:43
 msgid "get_nexusvlan_binding() called"
 msgstr "已呼叫 get_nexusvlan_binding()"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:49
 msgid "add_nexusport_binding() called"
 msgstr "已呼叫 add_nexusport_binding()"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:62
 msgid "remove_nexusport_binding() called"
 msgstr "已呼叫 remove_nexusport_binding()"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:78
+msgid "update_nexusport_binding called with no vlan"
+msgstr ""
+
+#: neutron/plugins/cisco/db/nexus_db_v2.py:80
 msgid "update_nexusport_binding called"
 msgstr "已呼叫 update_nexusport_binding"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:91
 msgid "get_nexusvm_binding() called"
 msgstr "已呼叫 get_nexusvm_binding()"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:98
 msgid "get_port_vlan_switch_binding() called"
 msgstr "已呼叫 get_port_vlan_switch_binding()"
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:106
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: neutron/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:118
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
@@ -4712,38 +4687,38 @@ msgid ""
 "pool"
 msgstr "正在將實體網路 %(physical_network)s 上的 VLAN %(vlan_id)s 從儲存區中移除"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:43
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr "Tenant 網路的網路類型（本端、平面、VLAN 或無）"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:47
 #: neutron/plugins/linuxbridge/common/config.py:34
 #: neutron/plugins/mlnx/common/config.py:32
 #: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr "<physical_network>:<vlan_min>:<vlan_max> 或 <physical_network> 的清單"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:75
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:97
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr "指定給 %s 網路的 segmentation_id"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:82
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr "指定給 %s 網路的 physical_network"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:124
 msgid "physical_network not provided"
 msgstr "未提供 physical_network"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:176
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr "無效的 tenant_network_type：%s。已終止代理程式！"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:198
 #: neutron/plugins/linuxbridge/lb_neutron_plugin.py:285
 #: neutron/plugins/ml2/drivers/type_vlan.py:94
 #: neutron/plugins/mlnx/mlnx_plugin.py:107
@@ -4752,12 +4727,12 @@ msgstr "無效的 tenant_network_type：%s。已終止代理程式！"
 msgid "Network VLAN ranges: %s"
 msgstr "網路 VLAN 範圍：%s"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:223
 #, python-format
 msgid "Network type %s not supported"
 msgstr "不支援網路類型 %s"
 
-#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:249
 #: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
 #: neutron/plugins/mlnx/mlnx_plugin.py:271
 #: neutron/plugins/openvswitch/ovs_neutron_plugin.py:479
@@ -6743,92 +6718,92 @@ msgstr ""
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:167
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr "activate_port_if_ready()：跳過，port.admin_state_up 為 False。"
 
-#: neutron/plugins/nec/nec_plugin.py:167
+#: neutron/plugins/nec/nec_plugin.py:171
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr "activate_port_if_ready()：跳過，port.admin_state_up 為 False。"
 
-#: neutron/plugins/nec/nec_plugin.py:171
+#: neutron/plugins/nec/nec_plugin.py:175
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr "activate_port_if_ready()：跳過，此埠沒有 PortInfo。"
 
-#: neutron/plugins/nec/nec_plugin.py:187
+#: neutron/plugins/nec/nec_plugin.py:191
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr "activate_port_if_ready()：跳過，ofc_port 已存在。"
 
-#: neutron/plugins/nec/nec_plugin.py:193
+#: neutron/plugins/nec/nec_plugin.py:197
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr "create_ofc_port() 由於 %s 而失敗"
 
-#: neutron/plugins/nec/nec_plugin.py:211
+#: neutron/plugins/nec/nec_plugin.py:215
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr "delete_ofc_port() 由於 %s 而失敗"
 
-#: neutron/plugins/nec/nec_plugin.py:215
+#: neutron/plugins/nec/nec_plugin.py:219
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr "deactivate_port()：跳過，ofc_port 不存在。"
 
-#: neutron/plugins/nec/nec_plugin.py:237
+#: neutron/plugins/nec/nec_plugin.py:239
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr "已呼叫 NECPluginV2.create_network()，網路 = %s。"
 
-#: neutron/plugins/nec/nec_plugin.py:256
+#: neutron/plugins/nec/nec_plugin.py:258
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr "create_network() 由於 %s 而失敗"
 
-#: neutron/plugins/nec/nec_plugin.py:272
+#: neutron/plugins/nec/nec_plugin.py:274
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr "已呼叫 NECPluginV2.update_network()，ID = %(id)s 網路 = %(network)s。"
 
-#: neutron/plugins/nec/nec_plugin.py:312
+#: neutron/plugins/nec/nec_plugin.py:314
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr "已呼叫 NECPluginV2.delete_network()，ID = %s。"
 
-#: neutron/plugins/nec/nec_plugin.py:331
+#: neutron/plugins/nec/nec_plugin.py:333
 #, python-format
 msgid "Failed to delete port(s)=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:346
+#: neutron/plugins/nec/nec_plugin.py:348
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr "delete_network() 由於 %s 而失敗"
 
-#: neutron/plugins/nec/nec_plugin.py:361
+#: neutron/plugins/nec/nec_plugin.py:363
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr "delete_ofc_tenant() 由於 %s 而失敗"
 
-#: neutron/plugins/nec/nec_plugin.py:373
+#: neutron/plugins/nec/nec_plugin.py:376
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr "已呼叫 NECPluginV2.create_port()，埠 = %s。"
 
-#: neutron/plugins/nec/nec_plugin.py:392
+#: neutron/plugins/nec/nec_plugin.py:399
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr "已呼叫 NECPluginV2.update_port()，ID = %(id)s 埠 = %(port)s。"
 
-#: neutron/plugins/nec/nec_plugin.py:418
+#: neutron/plugins/nec/nec_plugin.py:428
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr "已呼叫 NECPluginV2.delete_port()，ID = %s。"
 
-#: neutron/plugins/nec/nec_plugin.py:426
+#: neutron/plugins/nec/nec_plugin.py:436
 #, python-format
 msgid "Failed to delete port=%s from OFC."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:501
+#: neutron/plugins/nec/nec_plugin.py:496
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
@@ -6837,26 +6812,26 @@ msgstr ""
 "已呼叫 NECPluginV2RPCCallbacks.get_port_from_device()，裝置 = %(device)s => "
 "%(ret)s。"
 
-#: neutron/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:527
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr "已呼叫 NECPluginV2RPCCallbacks.update_ports()，kwargs = %s。"
 
-#: neutron/plugins/nec/nec_plugin.py:542
+#: neutron/plugins/nec/nec_plugin.py:537
 #, python-format
 msgid ""
 "update_ports(): ignore unchanged portinfo in port_added message "
 "(port_id=%s)."
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:556
+#: neutron/plugins/nec/nec_plugin.py:551
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: neutron/plugins/nec/nec_plugin.py:561
+#: neutron/plugins/nec/nec_plugin.py:556
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -8666,12 +8641,12 @@ msgstr "此外掛程式尚不支援 admin_state_up = False 的網路。正在忽
 msgid "Network Admin State Validation Falied: "
 msgstr "網路管理狀態驗證失敗："
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:61
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr "get_ofp_rest_api：%s"
 
-#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:120
 msgid "Invalid configuration. check ryu.ini"
 msgstr "無效的配置。請檢查 ryu.ini"
 
@@ -9265,3 +9240,27 @@ msgstr "找不到 lrouter：%s"
 #~ msgid "Missing rule info argument for insert/remove rule opertaion."
 #~ msgstr ""
 
+#~ msgid "Uncaught exception"
+#~ msgstr "未捕捉到的異常狀況"
+
+#~ msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
+#~ msgstr "Tenant %(tenant_id)s 的認證 %(credential_id)s 已存在"
+
+#~ msgid "get_all_vlanids() called"
+#~ msgstr "已呼叫 get_all_vlanids()"
+
+#~ msgid "is_vlanid_used() called"
+#~ msgstr "已呼叫 is_vlanid_used()"
+
+#~ msgid "release_vlanid() called"
+#~ msgstr "已呼叫 release_vlanid()"
+
+#~ msgid "delete_vlanid() called"
+#~ msgstr "已呼叫 delete_vlanid()"
+
+#~ msgid "reserve_vlanid() called"
+#~ msgstr "已呼叫 reserve_vlanid()"
+
+#~ msgid "get_all_nexusport_bindings() called"
+#~ msgstr "已呼叫 get_all_nexusport_bindings()"
+