diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-22 00:26:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-22 00:26:56 +0000 |
| commit | 52b657682c65617e30fee1ecf214ef972c51e8b9 (patch) | |
| tree | b588225dcf2090033ba8b3db9a5886ce6b500f66 /nova/api | |
| parent | f6015d829935dd84b94c72eb4561858f9495f9f2 (diff) | |
| parent | aaf09adf61926f1371a185591a727f715a95a794 (diff) | |
| download | nova-52b657682c65617e30fee1ecf214ef972c51e8b9.tar.gz nova-52b657682c65617e30fee1ecf214ef972c51e8b9.tar.xz nova-52b657682c65617e30fee1ecf214ef972c51e8b9.zip | |
Merge "Add missing ec2 security group quantum mixin"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 10 |
1 files changed, 10 insertions, 0 deletions
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() |