Imported Translations from Transifex

Change-Id: I3eebef458f0501227d971d455c00b98bb295dfed

diff --git a/neutron/locale/ar/LC_MESSAGES/neutron.po b/neutron/locale/ar/LC_MESSAGES/neutron.po
index 2e8e28fb01c731ff0a4fcbda0f37ea2fc6345314..ec337fbc0b76cc67aac2edcaf33c92a92d15668d 100644 (file)
--- a/neutron/locale/ar/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ar/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-09-12 23:31+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Arabic "
@@ -461,14 +461,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -478,7 +478,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -561,51 +561,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1602,8 +1602,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1722,283 +1722,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2628,7 +2628,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3279,6 +3279,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11564,8 +11569,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/bg_BG/LC_MESSAGES/neutron.po b/neutron/locale/bg_BG/LC_MESSAGES/neutron.po
index 662e8d0d44becdfad057847061fee4c93175df09..8c26024915f17265681011581f00aa40d132ebe5 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (Bulgaria) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/bs/LC_MESSAGES/neutron.po b/neutron/locale/bs/LC_MESSAGES/neutron.po
index 31a9ba345966e4097842b81b21f2e1fb646f08c1..1539f0d1b5a27b24091b0b050c90e6f0af76f73f 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bosnian "
@@ -461,14 +461,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -478,7 +478,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -561,51 +561,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1602,8 +1602,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1722,283 +1722,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2628,7 +2628,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3279,6 +3279,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11564,8 +11569,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/ca/LC_MESSAGES/neutron.po b/neutron/locale/ca/LC_MESSAGES/neutron.po
index 095687e6d2324aff87ba45aa30760bb8b1c98bbf..949ff42a4ab13cfcd2722f5dca2eadd0d1f1de7e 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/cs/LC_MESSAGES/neutron.po b/neutron/locale/cs/LC_MESSAGES/neutron.po
index 13b3ba90b387874113614e1e8c2c3160d159704d..00f29162bba66766ef207724f3a3fbea710161a9 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/da/LC_MESSAGES/neutron.po b/neutron/locale/da/LC_MESSAGES/neutron.po
index a60cb5179ad6493ca95f8ab9a040f6fbfc9e9b42..0901e0114e993dc5e05f5d9ccce43a1f9e133000 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Danish "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/de/LC_MESSAGES/neutron.po b/neutron/locale/de/LC_MESSAGES/neutron.po
index 5d59ccf001138d8a4ea9c03511ff4b2ec7da54b3..28f36bcd320f7e2f41e527330fe6786b706cfb56 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-05-22 08:17+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: German "
@@ -468,14 +468,14 @@ msgstr ""
 "%(port_num)d Routerports auf dem Zugangsnetz für Metadaten gefunden. Nur "
 "Port '%(port_id)s' für Router '%(router_id)s' wird berücksichtigt"
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -485,7 +485,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr "Erstellung des Statusberichts fehlgeschlagen!"
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -574,51 +574,51 @@ msgstr "Ignorieren mehrerer IP-Adressen auf Routerport %s"
 msgid "Failed sending gratuitous ARP: %s"
 msgstr "Gratuitous ARP wurde nicht gesendet: %s"
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr "Die externe Netzbrücke '%s' ist nicht vorhanden"
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr "Synchronisation von Routern fehlgeschlagen"
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr "Agent der Ebene 3 gestartet"
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr "Der hinzugefügte Routeneintrag lautet '%s'"
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr "Der entfernte Routeneintrag lautet '%s'"
@@ -1656,8 +1656,8 @@ msgid "%s failed"
 msgstr "%s fehlgeschlagen"
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 "Anforderung fehlgeschlagen: interner Serverfehler bei Verarbeitung Ihrer "
@@ -1787,78 +1787,78 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr "Eine unbekannte Ausnahme ist aufgetreten."
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr "Fehlerhafte %(resource)s-Anfrage: %(msg)s"
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr "Nicht autorisiert."
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, 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:70
+#: neutron/common/exceptions.py:74
 #, 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:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr "Netz %(net_id)s konnte nicht gefunden werden"
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr "Teilnetz %(subnet_id)s konnte nicht gefunden werden"
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, 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:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr "Policy-Konfiguration 'policy.json' konnte nicht gefunden werden"
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr "Nicht unterstützter Portstatus: %(port_state)s"
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr "Die Ressource ist belegt"
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
@@ -1867,7 +1867,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:120
+#: neutron/common/exceptions.py:124
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
@@ -1876,7 +1876,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:125
+#: neutron/common/exceptions.py:129
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
@@ -1886,7 +1886,7 @@ msgstr ""
 "abgeschlossen werden. Port verfügt bereits über eine angehängte Einheit "
 "%(device_id)s."
 
-#: neutron/common/exceptions.py:131
+#: neutron/common/exceptions.py:135
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
@@ -1895,7 +1895,7 @@ msgstr ""
 "Operation kann für Netz %(net_id)s nicht abgeschlossen werden. Die MAC-"
 "Adresse %(mac)s ist belegt."
 
-#: neutron/common/exceptions.py:137
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
@@ -1904,7 +1904,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:143
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
@@ -1913,7 +1913,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:148
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
@@ -1922,7 +1922,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:153
+#: neutron/common/exceptions.py:157
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
@@ -1931,7 +1931,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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
@@ -1940,18 +1940,18 @@ msgstr ""
 "Das einfache Netz kann nicht erstellt werden. Das physische Netz "
 "%(physical_network)s ist belegt."
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, 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:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr "Erstellung von Nutzernetzen ist nicht aktiviert."
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
@@ -1959,7 +1959,7 @@ msgstr ""
 "Das Netz kann nicht erstellt werden. Es ist kein Nutzernetz für die "
 "Zuordnung verfügbar."
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
@@ -1968,22 +1968,22 @@ msgstr ""
 "Teilnetz auf Port %(port_id)s stimmt nicht mit dem angeforderten Teilnetz"
 " %(subnet_id)s überein"
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr "Fehlerhafter Anforderungshauptteil: %(reason)s"
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr "Ungültige Eingabe für Operation: %(error_message)s."
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr "Der Zuordnungspool %(pool)s ist nicht gültig."
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
@@ -1992,52 +1992,52 @@ msgstr ""
 "Überschneidung bei Zuordnungspools %(pool_1)s %(pool_2)s für Teilnetz "
 "%(subnet_cidr)s gefunden. "
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, 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:223
 #, 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:227
 #, 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:231
 #, 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:235
 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:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr "Unbekannte Quotenressourcen %(unknown)s."
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, 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:247
 msgid "Tenant-id was missing from Quota request"
 msgstr "Nutzer-ID aus Quotenanforderung hat gefehlt"
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
@@ -2046,7 +2046,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:256
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
@@ -2055,48 +2055,48 @@ 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr "Ungültige Erweiterungsumgebung: %(reason)s"
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, 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:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr "Es sind mehrere externe Netze vorhanden"
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, 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:279
+#: neutron/common/exceptions.py:283
 #, 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:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2771,7 +2771,7 @@ msgstr "Sie müssen eine Überarbeitung oder ein relatives Delta bereitstellen"
 msgid "Available commands"
 msgstr "Verfügbare Befehle"
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3475,6 +3475,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -12036,8 +12041,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/en_AU/LC_MESSAGES/neutron.po b/neutron/locale/en_AU/LC_MESSAGES/neutron.po
index 5cd662f9645dae6b278a220a04f8781d384e3dd3..70f49eecad2a25e38523c045371a11912935efae 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (Australia) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/en_GB/LC_MESSAGES/neutron.po b/neutron/locale/en_GB/LC_MESSAGES/neutron.po
index 182984a5ce8245c0f64dbcc6fb051b76ed5e5100..4b51671c819f0f4fe61c9308ce88b49855ffd366 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United Kingdom) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/en_US/LC_MESSAGES/neutron.po b/neutron/locale/en_US/LC_MESSAGES/neutron.po
index 19f9c6221b9a795992fd39d33cd9e4a219703179..b135f8931a2408da5b7561185021d2db56507e7b 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United States) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/es/LC_MESSAGES/neutron.po b/neutron/locale/es/LC_MESSAGES/neutron.po
index e1c688c2b144714e2fcccf6d6f399d8e209e295a..f0d3b40d24379de684be594c9cbf90a94a4be007 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/es_MX/LC_MESSAGES/neutron.po b/neutron/locale/es_MX/LC_MESSAGES/neutron.po
index 755ebc805dbd7c2ddc2d3594c5c91d6e23e9e5a1..4722eba08abb30baacc3bb21fbeca84a4a14770f 100644 (file)
--- a/neutron/locale/es_MX/LC_MESSAGES/neutron.po
+++ b/neutron/locale/es_MX/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-08-29 05:16+0000\n"
 "Last-Translator: Tom Fifield <tom@openstack.org>\n"
 "Language-Team: Spanish (Mexico) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/fi_FI/LC_MESSAGES/neutron.po b/neutron/locale/fi_FI/LC_MESSAGES/neutron.po
index 9cfc6c05a34970905c200cce639cb6cf8c9f1bbd..21b7ad6c1960de44a5f042606e54809d78e415ab 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish (Finland) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/fr/LC_MESSAGES/neutron.po b/neutron/locale/fr/LC_MESSAGES/neutron.po
index 6670f687ac71d71c9e68b4cef443da22048d976e..03afe3a268635d023745d611998238d74246550b 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/hi/LC_MESSAGES/neutron.po b/neutron/locale/hi/LC_MESSAGES/neutron.po
index e61b0ce35f911953be507cefc0c05ad45843d317..38ef1af400648d7884d810ac8ba14055eaafbfb1 100644 (file)
--- a/neutron/locale/hi/LC_MESSAGES/neutron.po
+++ b/neutron/locale/hi/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-08-27 04:58+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Hindi "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/hr/LC_MESSAGES/neutron.po b/neutron/locale/hr/LC_MESSAGES/neutron.po
index e223a2dad0559ed696b37b98271cfd32a1f6ced8..b26aab689ad9b7c0d74220bc52aa50431ceb373d 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Croatian "
@@ -461,14 +461,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -478,7 +478,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -561,51 +561,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1602,8 +1602,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1722,283 +1722,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2628,7 +2628,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3279,6 +3279,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11564,8 +11569,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/hu/LC_MESSAGES/neutron.po b/neutron/locale/hu/LC_MESSAGES/neutron.po
index f07b43b435e425aaac9c20f7d0716614e3f745c2..6a3131ba39186328d40803329db887dc31729853 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hungarian "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/id/LC_MESSAGES/neutron.po b/neutron/locale/id/LC_MESSAGES/neutron.po
index ebb4739296df069161f07511f06a2bd7642e2f6d..af8de5b672238fa68d32e1fcec58e0f85b12c759 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Indonesian "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/it/LC_MESSAGES/neutron.po b/neutron/locale/it/LC_MESSAGES/neutron.po
index 5019e300670e065c636e7d110d4e5c4e3bf4220f..54aa062c94db715aad063c1575accad5696c9ef5 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/it_IT/LC_MESSAGES/neutron.po b/neutron/locale/it_IT/LC_MESSAGES/neutron.po
index 51363bf464096702838103fbc127ea2932c55971..5bcf6ab860aaf66c29d58cf3d72acb917c53bf5c 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Italian (Italy) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/ja/LC_MESSAGES/neutron.po b/neutron/locale/ja/LC_MESSAGES/neutron.po
index fae4492b685ccffb94eb2ba5db95006b7135abdf..6c01120ce0b3cee6b29aa1b7f41a764a61ae5004 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-30 10:28+0000\n"
 "Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
 "Language-Team: Japanese "
@@ -461,14 +461,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -478,7 +478,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -561,51 +561,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1602,8 +1602,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1722,283 +1722,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2628,7 +2628,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3279,6 +3279,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11564,8 +11569,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/ka_GE/LC_MESSAGES/neutron.po b/neutron/locale/ka_GE/LC_MESSAGES/neutron.po
index 0634a754be40d3dfd45719e59d993d4388115f15..d5c94c90424a347403393c790416606fea4d41bf 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+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"
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr "L3 აგენტი ჩაირთულია"
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr "%s ვერ განხორციელდა"
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr "არ არის ავტორიზებული."
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr "რესურსი გამოყენებულია"
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11564,8 +11569,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/ko/LC_MESSAGES/neutron.po b/neutron/locale/ko/LC_MESSAGES/neutron.po
index a8ced9423f9adec7c8f61d086b29d4bba61b85f9..9f009888119ce0943d0ae39b036dbf1aaa388844 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Korean "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/ko_KR/LC_MESSAGES/neutron.po b/neutron/locale/ko_KR/LC_MESSAGES/neutron.po
index b5ed500b7978c1b6c223c585bea4e757ecb97417..01844ee087e8dfaa9786d2cf449aebc52b885b0e 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+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"
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/ms/LC_MESSAGES/neutron.po b/neutron/locale/ms/LC_MESSAGES/neutron.po
index 84d7cec257cf695143b7198767cc575568671fcf..6c034640b7f1befe50340c2f7e452ae71e854c49 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Malay "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/nb/LC_MESSAGES/neutron.po b/neutron/locale/nb/LC_MESSAGES/neutron.po
index b93c0315d1ec8e28b55ea2a034d33a90a3a58f4e..08c183b17cbc3a94ff885acd4261f8d407284a0f 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian Bokmål "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/ne/LC_MESSAGES/neutron.po b/neutron/locale/ne/LC_MESSAGES/neutron.po
index 4a2a6d43aebba65c38e0c45a553467a3d908ad1d..44c001c02acbb0b139693c6466a94be832bbc5ee 100644 (file)
--- a/neutron/locale/ne/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ne/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-09-05 06:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Nepali "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/neutron.pot b/neutron/locale/neutron.pot
index 06c9cbbeb8d37f1b71043016b9c04eb6237dd1a6..66843fb17f2615e40fba930a8b6fc757c06e8189 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.79"
+"Project-Id-Version: neutron jenkins.neutron.propose.translation.update.80"
 "\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/nl_NL/LC_MESSAGES/neutron.po b/neutron/locale/nl_NL/LC_MESSAGES/neutron.po
index 417fa60fea3a918e695cedc2b541481f57c90b7c..a406611ef3ba493e583642ee824f4f2827870917 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dutch (Netherlands) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/pl_PL/LC_MESSAGES/neutron.po b/neutron/locale/pl_PL/LC_MESSAGES/neutron.po
index f1d3bab3ad044b9baaf89fe95e76485d368f507b..e9d9c771acc2bae60f78a9d12e513bbf298ca76c 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+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) "
@@ -461,14 +461,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -478,7 +478,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -561,51 +561,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1602,8 +1602,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1722,283 +1722,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2628,7 +2628,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3279,6 +3279,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11564,8 +11569,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/pt/LC_MESSAGES/neutron.po b/neutron/locale/pt/LC_MESSAGES/neutron.po
index 5b78970bd7dca17efb96b5e71da4a37022944b09..01fe3f8b4f9e305298e7f4fbd7ac303bae10679b 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/pt_BR/LC_MESSAGES/neutron.po b/neutron/locale/pt_BR/LC_MESSAGES/neutron.po
index f1a05e06e623f7444eae874efd10f5a4f368e838..2007dae3ff8469d03ee5b82c35e8f45512358c7d 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese (Brazil) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/ro/LC_MESSAGES/neutron.po b/neutron/locale/ro/LC_MESSAGES/neutron.po
index 2f74fdc534c0ed80789de14acf52c85ec4c01741..86279b5fef1c166a06ef4d5b0b054861dc99be58 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-06-08 07:51+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Romanian "
@@ -461,14 +461,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -478,7 +478,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -561,51 +561,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1602,8 +1602,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1722,283 +1722,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2628,7 +2628,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3279,6 +3279,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11564,8 +11569,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/ru/LC_MESSAGES/neutron.po b/neutron/locale/ru/LC_MESSAGES/neutron.po
index a0de225f0c8c87eb7f93427ac6ccc02cf3d65042..dd3a20b98a6e9ea266b7485338440bf398af7e63 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian "
@@ -461,14 +461,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -478,7 +478,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -561,51 +561,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1602,8 +1602,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1722,283 +1722,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2628,7 +2628,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3279,6 +3279,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11564,8 +11569,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/ru_RU/LC_MESSAGES/neutron.po b/neutron/locale/ru_RU/LC_MESSAGES/neutron.po
index c329111285b4f907a1dc38ade429452be7c96ef3..9446aaae9442981a1b5c51a6bc6a79dbb47346a7 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian (Russia) "
@@ -461,14 +461,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -478,7 +478,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -561,51 +561,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1602,8 +1602,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1722,283 +1722,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2628,7 +2628,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3279,6 +3279,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11564,8 +11569,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/sk/LC_MESSAGES/neutron.po b/neutron/locale/sk/LC_MESSAGES/neutron.po
index 289e69de6761265a47e6e0fc04829eb1f967126a..3b749f2f8843cfc6ca016dfb38dabf98f819e5d2 100644 (file)
--- a/neutron/locale/sk/LC_MESSAGES/neutron.po
+++ b/neutron/locale/sk/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-08-27 04:58+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Slovak "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/sl_SI/LC_MESSAGES/neutron.po b/neutron/locale/sl_SI/LC_MESSAGES/neutron.po
index 753218f3418930d4ec694ebd4bab22a901b96208..325344e4197e2c746b6282e592964e61f323ce05 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+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) "
@@ -461,14 +461,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -478,7 +478,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -561,51 +561,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1602,8 +1602,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1722,283 +1722,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2628,7 +2628,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3279,6 +3279,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11564,8 +11569,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/sw_KE/LC_MESSAGES/neutron.po b/neutron/locale/sw_KE/LC_MESSAGES/neutron.po
index e64b51f16f9b230253d9400218f95ab8057d9f5f..3ffe0273a4788400b52e16e881c0b9d0da6c8e0a 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swahili (Kenya) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/tl/LC_MESSAGES/neutron.po b/neutron/locale/tl/LC_MESSAGES/neutron.po
index 6129e21025e885cbd1b9e8f99aae52de0bcbef70..25fabeba6449f164f3d6be77498c6ebeb4ba8f93 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Tagalog "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/tr_TR/LC_MESSAGES/neutron.po b/neutron/locale/tr_TR/LC_MESSAGES/neutron.po
index e2f6ac49b3f57606b392cd1d65553d8376684b57..942e51b8600ad185032fe0ee39dbbc45b24502f9 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish (Turkey) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/uk/LC_MESSAGES/neutron.po b/neutron/locale/uk/LC_MESSAGES/neutron.po
index bcdcf1d217721fdcad47053052c3378798f2523d..dfc273bae98af64bdbca77228505391a45cebf96 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Ukrainian "
@@ -461,14 +461,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -478,7 +478,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -561,51 +561,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1602,8 +1602,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1722,283 +1722,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2628,7 +2628,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3279,6 +3279,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11564,8 +11569,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/vi_VN/LC_MESSAGES/neutron.po b/neutron/locale/vi_VN/LC_MESSAGES/neutron.po
index 5a5e655e7958d676c2896784caa1eafc4e648b85..d30447e1380763e574e0b6ce9a3894248cc4d09f 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/zh_CN/LC_MESSAGES/neutron.po b/neutron/locale/zh_CN/LC_MESSAGES/neutron.po
index d62c8b7a535ff74f8a8cd7ab651243016f223019..22e8f03a5f64a9b88f5f5f6bef840072ec80321d 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/zh_HK/LC_MESSAGES/neutron.po b/neutron/locale/zh_HK/LC_MESSAGES/neutron.po
index 33824ba360f86fbae0e5d258bf9c093d2c45f84d..50a962b58821769657c394595edb9e701d025e6a 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Hong Kong) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -560,51 +560,51 @@ msgstr ""
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
@@ -1601,8 +1601,8 @@ msgid "%s failed"
 msgstr ""
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
@@ -1721,283 +1721,283 @@ msgstr ""
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr ""
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr ""
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:164
+#: neutron/common/exceptions.py:168
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: neutron/common/exceptions.py:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:219
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:223
+#: neutron/common/exceptions.py:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr ""
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:279
+#: neutron/common/exceptions.py:283
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2627,7 +2627,7 @@ msgstr ""
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3278,6 +3278,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11563,8 +11568,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""
 

diff --git a/neutron/locale/zh_TW/LC_MESSAGES/neutron.po b/neutron/locale/zh_TW/LC_MESSAGES/neutron.po
index db8a49e20e809a348ca11525bd695ea8b8aa22cf..36d83d6371513559f087fd50d2b8b552c136161a 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-09-15 06:08+0000\n"
+"POT-Creation-Date: 2013-09-16 06:08+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) "
@@ -460,14 +460,14 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr "在 meta 資料存取網路上找到 %(port_num)d 個路由器埠。將僅考量路由器 %(router_id)s 的埠 %(port_id)s"
 
-#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:818
+#: neutron/agent/dhcp_agent.py:558 neutron/agent/l3_agent.py:819
 #: neutron/services/metering/agents/metering_agent.py:268
 msgid ""
 "Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:823
+#: neutron/agent/dhcp_agent.py:564 neutron/agent/l3_agent.py:824
 #: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:762
 #: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:256
 #: neutron/plugins/nec/agent/nec_neutron_agent.py:184
@@ -477,7 +477,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr "無法報告狀態！"
 
-#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:828
+#: neutron/agent/dhcp_agent.py:572 neutron/agent/l3_agent.py:829
 #: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:281
 #: neutron/services/metering/agents/metering_agent.py:276
 #, python-format
@@ -561,51 +561,51 @@ msgstr "正在忽略路由器埠 %s 上的多個 IP"
 msgid "Failed sending gratuitous ARP: %s"
 msgstr "傳送無償 ARP 時失敗：%s"
 
-#: neutron/agent/l3_agent.py:618
+#: neutron/agent/l3_agent.py:619
 #, python-format
 msgid "Got router deleted notification for %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:623
+#: neutron/agent/l3_agent.py:624
 #, python-format
 msgid "Got routers updated notification :%s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:631
+#: neutron/agent/l3_agent.py:632
 #, python-format
 msgid "Got router removed from agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:635
+#: neutron/agent/l3_agent.py:636
 #, python-format
 msgid "Got router added to agent :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:642
+#: neutron/agent/l3_agent.py:643
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr "外部網路橋接器 '%s' 不存在"
 
-#: neutron/agent/l3_agent.py:698 neutron/agent/l3_agent.py:729
+#: neutron/agent/l3_agent.py:699 neutron/agent/l3_agent.py:730
 #: neutron/services/metering/agents/metering_agent.py:58
 msgid "Failed synchronizing routers"
 msgstr "同步路由器時失敗"
 
-#: neutron/agent/l3_agent.py:725
+#: neutron/agent/l3_agent.py:726
 #, python-format
 msgid "Processing :%r"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:733
+#: neutron/agent/l3_agent.py:734
 msgid "L3 agent started"
 msgstr "已啟動 L3 代理程式"
 
-#: neutron/agent/l3_agent.py:753
+#: neutron/agent/l3_agent.py:754
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr "所新增的路徑項目是 '%s'"
 
-#: neutron/agent/l3_agent.py:761
+#: neutron/agent/l3_agent.py:762
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr "所移除的路徑項目是 '%s'"
@@ -1608,8 +1608,8 @@ msgid "%s failed"
 msgstr "%s 失敗"
 
 #: neutron/api/v2/resource.py:117
-#: neutron/tests/unit/test_api_v2_resource.py:263
-#: neutron/tests/unit/test_api_v2_resource.py:279
+#: neutron/tests/unit/test_api_v2_resource.py:261
+#: neutron/tests/unit/test_api_v2_resource.py:277
 msgid "Request Failed: internal server error while processing your request."
 msgstr "要求失敗：處理要求時發生內部伺服器錯誤。"
 
@@ -1728,283 +1728,283 @@ msgstr "無法從配置檔 %(config_path)s 載入 %(app_name)s。"
 msgid "An unknown exception occurred."
 msgstr "發生不明異常狀況。"
 
-#: neutron/common/exceptions.py:46
+#: neutron/common/exceptions.py:50
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr "錯誤的 %(resource)s 要求：%(msg)s"
 
-#: neutron/common/exceptions.py:58
+#: neutron/common/exceptions.py:62
 msgid "Not authorized."
 msgstr "未獲授權。"
 
-#: neutron/common/exceptions.py:62
+#: neutron/common/exceptions.py:66
 msgid "The service is unavailable"
 msgstr ""
 
-#: neutron/common/exceptions.py:66
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr "使用者沒有管理者專用權：%(reason)s"
 
-#: neutron/common/exceptions.py:70
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "原則不容許執行 %(action)s。"
 
-#: neutron/common/exceptions.py:74
+#: neutron/common/exceptions.py:78
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr "找不到網路 %(net_id)s"
 
-#: neutron/common/exceptions.py:78
+#: neutron/common/exceptions.py:82
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr "找不到子網路 %(subnet_id)s"
 
-#: neutron/common/exceptions.py:82
+#: neutron/common/exceptions.py:86
 #, python-format
 msgid "Port %(port_id)s could not be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:86
+#: neutron/common/exceptions.py:90
 #, 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:91
+#: neutron/common/exceptions.py:95
 msgid "Policy configuration policy.json could not be found"
 msgstr "找不到原則配置 policy.json 檔"
 
-#: neutron/common/exceptions.py:95
+#: neutron/common/exceptions.py:99
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: neutron/common/exceptions.py:99
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:103
+#: neutron/common/exceptions.py:107
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:107
+#: neutron/common/exceptions.py:111
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr "不支援的埠狀態：%(port_state)s"
 
-#: neutron/common/exceptions.py:111
+#: neutron/common/exceptions.py:115
 msgid "The resource is inuse"
 msgstr "資源已在使用中"
 
-#: neutron/common/exceptions.py:115
+#: neutron/common/exceptions.py:119
 #, 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:120
+#: neutron/common/exceptions.py:124
 #, 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:125
+#: neutron/common/exceptions.py:129
 #, 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:131
+#: neutron/common/exceptions.py:135
 #, 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:137
+#: neutron/common/exceptions.py:141
 #, 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:143
+#: neutron/common/exceptions.py:147
 #, 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:148
+#: neutron/common/exceptions.py:152
 #, 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:153
+#: neutron/common/exceptions.py:157
 #, 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:159
+#: neutron/common/exceptions.py:163
 #, 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:164
+#: neutron/common/exceptions.py:168
 #, 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:169
+#: neutron/common/exceptions.py:173
 msgid "Tenant network creation is not enabled."
 msgstr "未啟用 Tenant 網路建立作業。"
 
-#: neutron/common/exceptions.py:177
+#: neutron/common/exceptions.py:181
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr "無法建立網路。沒有可用於配置的 Tenant 網路。"
 
-#: neutron/common/exceptions.py:182
+#: neutron/common/exceptions.py:186
 #, 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:187
+#: neutron/common/exceptions.py:191
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr "要求內文的格式不正確：%(reason)s"
 
-#: neutron/common/exceptions.py:197
+#: neutron/common/exceptions.py:201
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr "作業的輸入無效：%(error_message)s。"
 
-#: neutron/common/exceptions.py:201
+#: neutron/common/exceptions.py:205
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr "配置儲存區 %(pool)s 無效。"
 
-#: neutron/common/exceptions.py:205
+#: neutron/common/exceptions.py:209
 #, 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:210
+#: neutron/common/exceptions.py:214
 #, 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:219
 #, 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:223
 #, 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:227
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr "橋接器 %(bridge)s 不存在。"
 
-#: neutron/common/exceptions.py:227
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr "建立失敗。%(dev_name)s 已存在。"
 
-#: neutron/common/exceptions.py:231
+#: neutron/common/exceptions.py:235
 msgid "Sudo priviledge is required to run this command."
 msgstr "需要 Sudo 專用權才能執行此指令。"
 
-#: neutron/common/exceptions.py:235
+#: neutron/common/exceptions.py:239
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr "不明的配額資源 %(unknown)s。"
 
-#: neutron/common/exceptions.py:239
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "資源已超出配額：%(overs)s"
 
-#: neutron/common/exceptions.py:243
+#: neutron/common/exceptions.py:247
 msgid "Tenant-id was missing from Quota request"
 msgstr "Quota 要求中遺漏了 Tenant-id"
 
-#: neutron/common/exceptions.py:247
+#: neutron/common/exceptions.py:251
 #, 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:256
 #, 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:261
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr "無效的延伸環境：%(reason)s"
 
-#: neutron/common/exceptions.py:261
+#: neutron/common/exceptions.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s"
 msgstr ""
 
-#: neutron/common/exceptions.py:265
+#: neutron/common/exceptions.py:269
 #, fuzzy, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr "在外部網路上找不到任何 IP 位址"
 
-#: neutron/common/exceptions.py:270
+#: neutron/common/exceptions.py:274
 msgid "More than one external network exists"
 msgstr "多個外部網路已存在"
 
-#: neutron/common/exceptions.py:274
+#: neutron/common/exceptions.py:278
 #, 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:279
+#: neutron/common/exceptions.py:283
 #, 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:284
+#: neutron/common/exceptions.py:288
 #, python-format
 msgid ""
 "Current gateway ip %(ip_address)s already in use by port %(port_id)s. "
 "Unable to update."
 msgstr ""
 
-#: neutron/common/exceptions.py:289
+#: neutron/common/exceptions.py:293
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: neutron/common/exceptions.py:299
+#: neutron/common/exceptions.py:303
 #, python-format
 msgid "Invalid network VXLAN port range: '%(vxlan_range)s'"
 msgstr ""
@@ -2638,7 +2638,7 @@ msgstr "必須提供修訂或相對差異"
 msgid "Available commands"
 msgstr "可用的指令"
 
-#: neutron/db/vpn/vpn_db.py:639
+#: neutron/db/vpn/vpn_db.py:658
 #, python-format
 msgid "vpnservice %s in db is already deleted"
 msgstr ""
@@ -3293,6 +3293,11 @@ msgstr ""
 msgid "Can not load driver :%(device_driver)s"
 msgstr ""
 
+#: neutron/extensions/vpnaas.py:85
+#, python-format
+msgid "Subnet %(subnet_id)s is not connected to Router %(router_id)s"
+msgstr ""
+
 #: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
@@ -11618,8 +11623,8 @@ msgstr ""
 msgid "Failed to disable vpn process on router %s"
 msgstr ""
 
-#: neutron/tests/unit/test_api_v2_resource.py:169
-#: neutron/tests/unit/test_api_v2_resource.py:232
+#: neutron/tests/unit/test_api_v2_resource.py:168
+#: neutron/tests/unit/test_api_v2_resource.py:230
 msgid "Unmapped error"
 msgstr ""