From efaeeb0457825120604fc6b38fef8409c3c57ca7 Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Sat, 6 Dec 2014 13:04:25 -0700
Subject: [PATCH] Remove common/rpc directory

Ironic uses common/rpc.py rather then a directory.  As a result of copying
this common code from ironic, need to remove the directory.

Change-Id: If818b318a75be783a29c8120f43ab43176aadcc9
---
 magnum/common/rpc/__init__.py |   0
 magnum/common/rpc/service.py  | 107 ----------------------------------
 2 files changed, 107 deletions(-)
 delete mode 100644 magnum/common/rpc/__init__.py
 delete mode 100644 magnum/common/rpc/service.py

diff --git a/magnum/common/rpc/__init__.py b/magnum/common/rpc/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/magnum/common/rpc/service.py b/magnum/common/rpc/service.py
deleted file mode 100644
index 6e5d7cc9c6..0000000000
--- a/magnum/common/rpc/service.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 2014 - Rackspace Hosting
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-
-"""Common RPC service and API tools for Magnum."""
-
-import eventlet
-from oslo.config import cfg
-from oslo import messaging
-from oslo.serialization import jsonutils
-
-import magnum.common.context
-
-
-# NOTE(paulczar):
-# Ubuntu 14.04 forces librabbitmq when kombu is used
-# Unfortunately it forces a version that has a crash
-# bug.  Calling eventlet.monkey_patch() tells kombu
-# to use libamqp instead.
-eventlet.monkey_patch()
-
-# NOTE(asalkeld):
-# The magnum.openstack.common.rpc entries are for compatability
-# with devstack rpc_backend configuration values.
-TRANSPORT_ALIASES = {
-    'magnum.openstack.common.rpc.impl_kombu': 'rabbit',
-    'magnum.openstack.common.rpc.impl_qpid': 'qpid',
-    'magnum.openstack.common.rpc.impl_zmq': 'zmq',
-}
-
-
-class JsonPayloadSerializer(messaging.NoOpSerializer):
-    @staticmethod
-    def serialize_entity(context, entity):
-        return jsonutils.to_primitive(entity, convert_instances=True)
-
-
-class RequestContextSerializer(messaging.Serializer):
-
-    def __init__(self, base=None):
-        self._base = base or messaging.NoOpSerializer()
-
-    def serialize_entity(self, context, entity):
-        if not self._base:
-            return entity
-        return self._base.serialize_entity(context, entity)
-
-    def deserialize_entity(self, context, entity):
-        if not self._base:
-            return entity
-        return self._base.deserialize_entity(context, entity)
-
-    def serialize_context(self, context):
-        return context.to_dict()
-
-    def deserialize_context(self, context):
-        return magnum.common.context.RequestContext.from_dict(context)
-
-
-class Service(object):
-    _server = None
-
-    def __init__(self, topic, server, handlers):
-        serializer = RequestContextSerializer(JsonPayloadSerializer())
-        transport = messaging.get_transport(cfg.CONF,
-                                            aliases=TRANSPORT_ALIASES)
-        # TODO(asalkeld) add support for version='x.y'
-        target = messaging.Target(topic=topic, server=server)
-        self._server = messaging.get_rpc_server(transport, target, handlers,
-                                                serializer=serializer)
-
-    def serve(self):
-        self._server.start()
-        self._server.wait()
-
-
-class API(object):
-    def __init__(self, transport=None, context=None, topic=None):
-        serializer = RequestContextSerializer(JsonPayloadSerializer())
-        if transport is None:
-            transport = messaging.get_transport(cfg.CONF,
-                                                aliases=TRANSPORT_ALIASES)
-        self._context = context
-        if topic is None:
-            topic = ''
-        target = messaging.Target(topic=topic)
-        self._client = messaging.RPCClient(transport, target,
-                                           serializer=serializer)
-
-    def _call(self, method, *args, **kwargs):
-        return self._client.call(self._context, method, *args, **kwargs)
-
-    def _cast(self, method, *args, **kwargs):
-        self._client.cast(self._context, method, *args, **kwargs)
-
-    def echo(self, message):
-        self._cast('echo', message=message)