Merge "Move protection service"

smaug/common/config.py

@@ -59,7 +59,7 @@ global_opts = [
                default='smaug-protection',
                help='The topic that protection nodes listen on'),
     cfg.StrOpt('protection_manager',
-               default='smaug.protection.manager.ProtectionManager',
+               default='smaug.services.protection.manager.ProtectionManager',
                help='Full class name for the Manager for Protection'),
     cfg.StrOpt('host',
                default=socket.gethostname(),

smaug/operationengine/manager.py

@@ -19,7 +19,7 @@ from oslo_log import log as logging
 import oslo_messaging as messaging
 
 from smaug import manager
-from smaug.protection import api as protection_api
+from smaug.services.protection import api as protection_api
 
 CONF = cfg.CONF
 

smaug/services/protection/api.py

@@ -17,7 +17,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 
 from smaug.db import base
-from smaug.protection import rpcapi as protection_rpcapi
+from smaug.services.protection import rpcapi as protection_rpcapi
 
 
 CONF = cfg.CONF

smaug/services/protection/manager.py

@@ -46,7 +46,7 @@ class ProtectionManager(manager.Manager):
         super(ProtectionManager, self).__init__(*args, **kwargs)
         # TODO(wangliuan)  more params and use profiler.trace_cls
         self.provider_registry = importutils.import_object(
-            'smaug.protection.provider.ProviderRegistry')
+            'smaug.services.protection.provider.ProviderRegistry')
         self.flow_engine = None
         # TODO(wangliuan)
 

smaug/tests/unit/protection/test_manager.py

@@ -11,7 +11,7 @@
 #    under the License.
 
 
-from smaug.protection import manager
+from smaug.services.protection import manager
 from smaug.tests import base
 from smaug.tests.unit.protection import fakes