diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-02 03:13:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-02 03:13:49 +0000 |
| commit | 1f852bf262661455e5bb097993a8f7ebc80dbb57 (patch) | |
| tree | b16926697f6862fb4af91ef1aaf2f2876036220d /nova/api | |
| parent | c97d5269801ed4d1ee5552d803777e35370d4b49 (diff) | |
| parent | 35b2b2c5c456c3138e0e31085c71d852320b9ce4 (diff) | |
Merge "Remove pylint errors for undefined GroupException members"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 8 | ||||
| -rw-r--r-- | nova/api/openstack/compute/contrib/security_groups.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 60b06c233..6bc5185bf 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1700,13 +1700,13 @@ class EC2SecurityGroupExceptions(object): pass -class CloudSecurityGroupNovaAPI(compute_api.SecurityGroupAPI, - EC2SecurityGroupExceptions): +class CloudSecurityGroupNovaAPI(EC2SecurityGroupExceptions, + compute_api.SecurityGroupAPI): pass -class CloudSecurityGroupQuantumAPI(quantum_driver.SecurityGroupAPI, - EC2SecurityGroupExceptions): +class CloudSecurityGroupQuantumAPI(EC2SecurityGroupExceptions, + quantum_driver.SecurityGroupAPI): pass diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py index 9124f277a..af97a2a6b 100644 --- a/nova/api/openstack/compute/contrib/security_groups.py +++ b/nova/api/openstack/compute/contrib/security_groups.py @@ -622,11 +622,11 @@ class NativeSecurityGroupExceptions(object): raise exc.HTTPNotFound(explanation=msg) -class NativeNovaSecurityGroupAPI(compute_api.SecurityGroupAPI, - NativeSecurityGroupExceptions): +class NativeNovaSecurityGroupAPI(NativeSecurityGroupExceptions, + compute_api.SecurityGroupAPI): pass -class NativeQuantumSecurityGroupAPI(quantum_driver.SecurityGroupAPI, - NativeSecurityGroupExceptions): +class NativeQuantumSecurityGroupAPI(NativeSecurityGroupExceptions, + quantum_driver.SecurityGroupAPI): pass |