Deepcopy port dict in dhcp rpc handler

Added deepcopy of port dict in dhcp rpc handler to prevent operating on
changed dict in case of raising retry request.

Change-Id: Ie1816fe819ba77061e71bd61de2fd9ebe4574cef
Related-Bug: #1494351

diff --git a/neutron/api/rpc/handlers/dhcp_rpc.py b/neutron/api/rpc/handlers/dhcp_rpc.py
index d7388e9e0d8b4cd7574bba9a940ab908a564f7ed..c7f84b1214e4087c03c0a87b9c8476d14319b41d 100644 (file)
--- a/neutron/api/rpc/handlers/dhcp_rpc.py
+++ b/neutron/api/rpc/handlers/dhcp_rpc.py
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import copy
 import itertools
 import operator
 
@@ -195,7 +196,9 @@ class DhcpRpcCallback(object):
 
         """
         host = kwargs.get('host')
-        port = kwargs.get('port')
+        # Note(pbondar): Create deep copy of port to prevent operating
+        # on changed dict if RetryRequest is raised
+        port = copy.deepcopy(kwargs.get('port'))
         LOG.debug('Create dhcp port %(port)s '
                   'from %(host)s.',
                   {'port': port,