commit b435dd4685ab30cc330e0055adb0fdb2193e986c
author Jenkins <jenkins@review.openstack.org> Fri Aug 23 12:59:43 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Aug 23 12:59:43 2013 +0000
tree bb0de8742f825342ad76f6739a3dce1d124232bd
parent eb59b7d83f2458932bd89fbfa22bd8b9b3e77d7c
parent ccfa65366a09fd273515ca0b1e4f55b452500dda

Merge "Fixing format_flavor to handle flavor extra_specs"

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 3a8986c..6fbb9e3 100644
--- a/tempest/services/compute/xml/flavors_client.py
+++ b/tempest/services/compute/xml/flavors_client.py
@@ -30,8 +30,6 @@
     "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):
@@ -51,7 +49,7 @@
             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:
+            if k == 'extra_specs':
                 k = 'OS-FLV-WITH-EXT-SPECS:extra_specs'
                 flavor[k] = dict(v)
                 continue