From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 9 Dec 2016 13:45:39 +0000 (+0000)
Subject: Merge "Replace uuid4() with uuidsentinel"
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=77ed22860db7a99a0fc54da6547d0fd9c5170da5;p=osstest%2Fopenstack-nova.git

Merge "Replace uuid4() with uuidsentinel"
---

77ed22860db7a99a0fc54da6547d0fd9c5170da5
diff --cc nova/tests/unit/api/openstack/compute/test_serversV21.py
index d3a05b97d3,681c8be080..0088496685
--- a/nova/tests/unit/api/openstack/compute/test_serversV21.py
+++ b/nova/tests/unit/api/openstack/compute/test_serversV21.py
@@@ -23,10 -24,9 +23,11 @@@ import iso860
  import mock
  from mox3 import mox
  from oslo_policy import policy as oslo_policy
 +from oslo_serialization import base64
  from oslo_serialization import jsonutils
 +from oslo_utils import encodeutils
  from oslo_utils import timeutils
+ from oslo_utils import uuidutils
  import six
  from six.moves import range
  import six.moves.urllib.parse as urlparse