commit 4369755ae2c7e11b57a63edefac6841773d34e09
author Jenkins <jenkins@review.openstack.org> Thu Aug 15 19:10:58 2013 +0000
committer Gerrit Code Review <review@openstack.org> Thu Aug 15 19:10:58 2013 +0000
tree 2edba69f1f39cea74bf1e86243f449f563b76c22
parent 5e293ccf2809fad87c80dfd9f36447fe31e5b32e
parent c04a0fc59d69068135dad7ffb1dbbcbdfd7b7bc9

Merge "Adding extra_specs to flavor format"

tempest/services/compute/xml/flavors_client.py

diff --git a/tempest/services/compute/xml/flavors_client.py b/tempest/services/compute/xml/flavors_client.py
index 6ba31ea..3a8986c 100644
--- a/tempest/services/compute/xml/flavors_client.py
+++ b/tempest/services/compute/xml/flavors_client.py
@@ -30,6 +30,8 @@
     "http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1"
 XMLNS_OS_FLV_ACCESS = \
     "http://docs.openstack.org/compute/ext/flavor_access/api/v1.1"
+XMLNS_OS_FLV_WITH_EXT_SPECS = \
+    "http://docs.openstack.org/compute/ext/flavor_with_extra_specs/api/v2.0"
 
 
 class FlavorsClientXML(RestClientXML):
@@ -49,6 +51,11 @@
             if k == '{%s}ephemeral' % XMLNS_OS_FLV_EXT_DATA:
                 k = 'OS-FLV-EXT-DATA:ephemeral'
 
+            if k == '{%s}extra_specs' % XMLNS_OS_FLV_WITH_EXT_SPECS:
+                k = 'OS-FLV-WITH-EXT-SPECS:extra_specs'
+                flavor[k] = dict(v)
+                continue
+
             try:
                 v = int(v)
             except ValueError: