From: zhhuabj <zhhuabj@cn.ibm.com>
Date: Sat, 12 Oct 2013 09:31:38 +0000 (+0800)
Subject: Updating address pairs with xml doesn't work
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=893e10b0add63b364eb6d92715967c45028fa692;p=openstack-build%2Fneutron-build.git

Updating address pairs with xml doesn't work

Below command can't work because list element
"allowed_address_pairs" hasn't been updated
into the varaiable "attr.PLURALS"
"neutron port-update <port-uuid> \
--allowed-address-pairs list=true type=dict \
ip_address=10.0.0.1 --request-format xml"

Change-Id: I0d7dcca5f4848bc968f5c86fbeb46569c70c8fcd
Closes-Bug: #1229954
---

diff --git a/neutron/extensions/allowedaddresspairs.py b/neutron/extensions/allowedaddresspairs.py
index ad4f310b7..fa089ba53 100644
--- a/neutron/extensions/allowedaddresspairs.py
+++ b/neutron/extensions/allowedaddresspairs.py
@@ -117,6 +117,8 @@ class Allowedaddresspairs(object):
 
     def get_extended_resources(self, version):
         if version == "2.0":
+            attr.PLURALS.update({'allowed_address_pairs':
+                                 'allowed_address_pair'})
             return EXTENDED_ATTRIBUTES_2_0
         else:
             return {}
diff --git a/neutron/tests/unit/test_extension_allowedaddresspairs.py b/neutron/tests/unit/test_extension_allowedaddresspairs.py
index 3e928350c..f036e19f2 100644
--- a/neutron/tests/unit/test_extension_allowedaddresspairs.py
+++ b/neutron/tests/unit/test_extension_allowedaddresspairs.py
@@ -99,10 +99,6 @@ class AllowedAddressPairDBTestCase(AllowedAddressPairTestCase):
         super(AllowedAddressPairDBTestCase, self).tearDown()
 
 
-class AllowedAddressPairDBTestCaseXML(AllowedAddressPairDBTestCase):
-    fmt = 'xml'
-
-
 class TestAllowedAddressPairs(AllowedAddressPairDBTestCase):
 
     def test_create_port_allowed_address_pairs(self):
@@ -297,3 +293,7 @@ class TestAllowedAddressPairs(AllowedAddressPairDBTestCase):
             port = self.deserialize(self.fmt, req.get_response(self.api))
             self.assertEqual(port['port'][addr_pair.ADDRESS_PAIRS], [])
             self._delete('ports', port['port']['id'])
+
+
+class TestAllowedAddressPairsXML(TestAllowedAddressPairs):
+    fmt = 'xml'