Skip to content

Commit

Permalink
Add missing ec2 security group quantum mixin
Browse files Browse the repository at this point in the history
Fixes bug 1131441

Change-Id: Ifc25e1a9eb113cd28a5a5ed9d277480c262cd7f3
  • Loading branch information
aaronorosen committed Feb 21, 2013
1 parent fc4ede9 commit aaf09ad
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions nova/api/ec2/cloud.py
Expand Up @@ -42,6 +42,7 @@
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
Expand Down Expand Up @@ -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()

0 comments on commit aaf09ad

Please sign in to comment.