From: Jenkins <jenkins@review.openstack.org>
Date: Sun, 2 Mar 2014 01:26:06 +0000 (+0000)
Subject: Merge "NSX: add missing space 'routeron'"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2964b8483a7a8c2708c2bfe6baadac633b91582d;p=openstack-build%2Fneutron-build.git

Merge "NSX: add missing space 'routeron'"
---

2964b8483a7a8c2708c2bfe6baadac633b91582d
diff --cc neutron/plugins/nicira/NeutronPlugin.py
index 3e076eb94,48e6b913e..40303c332
--- a/neutron/plugins/nicira/NeutronPlugin.py
+++ b/neutron/plugins/nicira/NeutronPlugin.py
@@@ -683,9 -690,9 +683,9 @@@ class NvpPluginV2(addr_pair_db.AllowedA
                  err_msg=_("Logical router resource %s not found "
                            "on NVP platform") % router_id)
          except api_exc.NsxApiException:
 -            raise nvp_exc.NvpPluginException(
 +            raise nsx_exc.NsxPluginException(
                  err_msg=_("Unable to update logical router"
-                           "on NVP Platform"))
+                           " on NVP Platform"))
          LOG.debug(_("_nvp_delete_ext_gw_port completed on external network "
                      "%(ext_net_id)s, attached to NSX router:%(router_id)s"),
                    {'ext_net_id': port_data['network_id'],