From 35b2b2c5c456c3138e0e31085c71d852320b9ce4 Mon Sep 17 00:00:00 2001 From: Aaron Rosen Date: Fri, 1 Mar 2013 10:23:01 -0800 Subject: Remove pylint errors for undefined GroupException members Pylint complains about 'SecurityGroupBase' has no 'raise_group_already_exists' member as these methods are called from SecurityGroupBase but do not exist in this class. This is fine as this class is not invoked directly. This patch adds these prototypes which raise NotImplementedError and changes the inheritance order as to not raise NotImplementedError. Fixes bug 1138269 Change-Id: I2d7b723a482dc8ca845e52e2a8f44c6fd31fa5db --- nova/api/ec2/cloud.py | 8 ++++---- nova/api/openstack/compute/contrib/security_groups.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'nova/api') 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 -- cgit