Merge "Remove pylint errors for undefined GroupException members"

3 files changed, 32 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
diff --git a/nova/network/security_group/security_group_base.py b/nova/network/security_group/security_group_base.py
index 499f808b1..af9d49a35 100644
--- a/nova/network/security_group/security_group_base.py
+++ b/nova/network/security_group/security_group_base.py
@@ -194,3 +194,27 @@ class SecurityGroupBase(object):
 
     def rule_exists(self, security_group, new_rule):
         raise NotImplementedError()
+
+    @staticmethod
+    def raise_invalid_property(msg):
+        raise NotImplementedError()
+
+    @staticmethod
+    def raise_group_already_exists(msg):
+        raise NotImplementedError()
+
+    @staticmethod
+    def raise_invalid_group(msg):
+        raise NotImplementedError()
+
+    @staticmethod
+    def raise_invalid_cidr(cidr, decoding_exception=None):
+        raise NotImplementedError()
+
+    @staticmethod
+    def raise_over_quota(msg):
+        raise NotImplementedError()
+
+    @staticmethod
+    def raise_not_found(msg):
+        raise NotImplementedError()