From aaf09adf61926f1371a185591a727f715a95a794 Mon Sep 17 00:00:00 2001 From: Aaron Rosen Date: Thu, 21 Feb 2013 14:12:09 -0800 Subject: Add missing ec2 security group quantum mixin Fixes bug 1131441 Change-Id: Ifc25e1a9eb113cd28a5a5ed9d277480c262cd7f3 --- nova/api/ec2/cloud.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'nova/api') diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index b3f9bd099..dcbde3428 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -42,6 +42,7 @@ from nova import db from nova import exception from nova.image import s3 from nova import network +from nova.network.security_group import quantum_driver from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import quota @@ -1696,6 +1697,15 @@ class CloudSecurityGroupNovaAPI(compute_api.SecurityGroupAPI, pass +class CloudSecurityGroupQuantumAPI(quantum_driver.SecurityGroupAPI, + EC2SecurityGroupExceptions): + pass + + def get_cloud_security_group_api(): if cfg.CONF.security_group_api.lower() == 'nova': return CloudSecurityGroupNovaAPI() + elif cfg.CONF.security_group_api.lower() == 'quantum': + return CloudSecurityGroupQuantumAPI() + else: + raise NotImplementedError() -- cgit