Allow router route update in XML.

Fixes: bug 1198188
Router updates of routes in XML format fails.
This patch fixes that problem. It also executes
unit tests for XML-based requests to update
router routes.

Change-Id: Ie65e889a29a3ca9242593d51587de60c8d97e055

diff --git a/neutron/extensions/extraroute.py b/neutron/extensions/extraroute.py
index fda040fd2b70545457e7240153324b316f738b47..d7c9dbc3f0b9c14a08ee1834792f174f79553e93 100644 (file)
--- a/neutron/extensions/extraroute.py
+++ b/neutron/extensions/extraroute.py
@@ -69,6 +69,7 @@ class Extraroute():
 
     def get_extended_resources(self, version):
         if version == "2.0":
+            attr.PLURALS.update({'routes': 'route'})
             return EXTENDED_ATTRIBUTES_2_0
         else:
             return {}

diff --git a/neutron/tests/unit/test_extension_extraroute.py b/neutron/tests/unit/test_extension_extraroute.py
index 510eb99a358fbda33299947f1eb8dfb9a6bf6f2a..7136e6e250bb41ebe14de53cbb9f72dffe24cf56 100644 (file)
--- a/neutron/tests/unit/test_extension_extraroute.py
+++ b/neutron/tests/unit/test_extension_extraroute.py
@@ -475,3 +475,7 @@ class ExtraRouteDBTestCase(test_l3.L3NatDBTestCase):
                                                     (router1, router2,
                                                      router3),
                                                     ('name', 'asc'), 2, 2)
+
+
+class ExtraRouteDBTestCaseXML(ExtraRouteDBTestCase):
+    fmt = 'xml'