Merge "Remove v2 extension setting from functional tests"

This commit is contained in:
Jenkins 2016-06-08 23:07:26 +00:00 committed by Gerrit Code Review
commit 5e1eede07b

View File

@ -13,23 +13,13 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import nova.conf
from nova.tests.functional.api_sample_tests import api_sample_base from nova.tests.functional.api_sample_tests import api_sample_base
CONF = nova.conf.CONF
class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
ADMIN_API = True ADMIN_API = True
extension_name = "os-aggregates" extension_name = "os-aggregates"
def _get_flags(self):
f = super(AggregatesSampleJsonTest, self)._get_flags()
f['osapi_compute_extension'] = CONF.osapi_compute_extension[:]
f['osapi_compute_extension'].append(
'nova.api.openstack.compute.contrib.aggregates.Aggregates')
return f
def test_aggregate_create(self): def test_aggregate_create(self):
subs = { subs = {
"aggregate_id": '(?P<id>\d+)' "aggregate_id": '(?P<id>\d+)'