Rename error class name

Author: Sunight

qingcloud/iaas/errors.py

@@ -42,9 +42,9 @@ def __str__(self):
                 self.err_code, self.err_msg)
 
 
-class RouterStaticError(StandardError):
+class InvalidRouterStatic(StandardError):
     pass
 
 
-class SecurityGroupRuleError(StandardError):
+class InvalidSecurityGroupRule(StandardError):
     pass

qingcloud/iaas/router_static.py

@@ -16,7 +16,7 @@
 
 import json
 
-from qingcloud.iaas.errors import RouterStaticError
+from qingcloud.iaas.errors import InvalidRouterStatic
 
 class RouterStaticFactory(object):
 
@@ -32,7 +32,7 @@ def create(cls, static_type, router_static_id='', **kw):
         """ Create router static.
         """
         if static_type not in STATIC_MAPPER:
-            raise RouterStaticError('invalid static type[%s]' % static_type)
+            raise InvalidRouterStatic('invalid static type[%s]' % static_type)
 
         clazz = STATIC_MAPPER[static_type]
         kw = clazz.extract(kw)
@@ -159,7 +159,7 @@ def __init__(self, vpn_type='', **kw):
         elif vpn_type == 'pptp':
             self.inst = _StaticForVPN.PPTP(**kw)
         else:
-            raise RouterStaticError('unsupported vpn type[%s]' % vpn_type)
+            raise InvalidRouterStatic('unsupported vpn type[%s]' % vpn_type)
 
     @staticmethod
     def extract(kw):

qingcloud/iaas/sg_rule.py

@@ -16,7 +16,7 @@
 
 import json
 
-from qingcloud.iaas.errors import SecurityGroupRuleError
+from qingcloud.iaas.errors import InvalidSecurityGroupRule
 
 class SecurityGroupRuleFactory(object):
 
@@ -38,9 +38,9 @@ def create(cls, protocol, priority, direction=INBOUND, action='accept',
             @param priority: should be between 0 and 100.
         """
         if protocol not in RULE_MAPPER:
-            raise SecurityGroupRuleError("invalid protocol[%s]" % protocol)
+            raise InvalidSecurityGroupRule("invalid protocol[%s]" % protocol)
         if not isinstance(priority, int) or priority < 0 or priority > 100:
-            raise SecurityGroupRuleError("invalid priority[%s]" % priority)
+            raise InvalidSecurityGroupRule("invalid priority[%s]" % priority)
 
         clazz = RULE_MAPPER[protocol]
         inst = clazz(**kw)

tests/test_router_static.py

@@ -16,7 +16,7 @@
 
 import unittest
 
-from qingcloud.iaas.errors import RouterStaticError
+from qingcloud.iaas.errors import InvalidRouterStatic
 from qingcloud.iaas.router_static import (RouterStaticFactory, _StaticForTunnel,
         _StaticForFiltering, _StaticForVPN, _StaticForPortForwarding)
 
@@ -102,7 +102,7 @@ def test_static_with_existing_id(self):
         self.assertEqual(json_data['router_static_id'], 'fakeid')
 
     def test_unsupported_static_type(self):
-        self.assertRaises(RouterStaticError, RouterStaticFactory.create, 'unsupported')
+        self.assertRaises(InvalidRouterStatic, RouterStaticFactory.create, 'unsupported')
 
     def test_create_from_string(self):
         string = '''

tests/test_sg_rule.py

@@ -16,7 +16,7 @@
 
 import unittest
 
-from qingcloud.iaas.errors import SecurityGroupRuleError
+from qingcloud.iaas.errors import InvalidSecurityGroupRule
 from qingcloud.iaas.sg_rule import SecurityGroupRuleFactory, _RuleForTCP, _RuleForGRE
 
 class SecurityGroupRuleFactoryTestCase(unittest.TestCase):
@@ -78,14 +78,14 @@ def test_rule_with_existing_id(self):
         self.assertEqual(json_data['security_group_rule_id'], 'fakeid')
 
     def test_unsupported_protocol(self):
-        self.assertRaises(SecurityGroupRuleError, SecurityGroupRuleFactory.create, 'unsupported', 0)
+        self.assertRaises(InvalidSecurityGroupRule, SecurityGroupRuleFactory.create, 'unsupported', 0)
 
     def test_invalid_priority(self):
-        self.assertRaises(SecurityGroupRuleError, SecurityGroupRuleFactory.create,
+        self.assertRaises(InvalidSecurityGroupRule, SecurityGroupRuleFactory.create,
                 SecurityGroupRuleFactory.PROTOCOL_UDP, -1)
-        self.assertRaises(SecurityGroupRuleError, SecurityGroupRuleFactory.create,
+        self.assertRaises(InvalidSecurityGroupRule, SecurityGroupRuleFactory.create,
                 SecurityGroupRuleFactory.PROTOCOL_UDP, 101)
-        self.assertRaises(SecurityGroupRuleError, SecurityGroupRuleFactory.create,
+        self.assertRaises(InvalidSecurityGroupRule, SecurityGroupRuleFactory.create,
                 SecurityGroupRuleFactory.PROTOCOL_UDP, '10')
 
         rule = SecurityGroupRuleFactory.create(SecurityGroupRuleFactory.PROTOCOL_UDP, 0)