From ff276797420e068ab32af52250d7a9c812ea3a4e Mon Sep 17 00:00:00 2001
From: caobiao <bjcb@cn.ibm.com>
Date: Wed, 14 Dec 2016 16:36:44 +0800
Subject: [PATCH] use uuidutils to generate UUID instead of uuid4

using uuid4 will get pep8 error when submit,so change to uuidutils

Change-Id: I3babf1f81132fae0bdb5b5aabd06427f80f8e678
---
 nova/virt/zvm/driver.py | 4 ++--
 test-requirements.txt   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nova/virt/zvm/driver.py b/nova/virt/zvm/driver.py
index de22607..472ec84 100644
--- a/nova/virt/zvm/driver.py
+++ b/nova/virt/zvm/driver.py
@@ -19,7 +19,6 @@ import operator
 import os
 import six
 import time
-import uuid
 
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
@@ -27,6 +26,7 @@ from oslo_service import loopingcall
 from oslo_utils import excutils
 from oslo_utils import timeutils
 from oslo_utils import units
+from oslo_utils import uuidutils
 from oslo_utils import versionutils
 
 from nova.api.metadata import base as instance_metadata
@@ -1496,7 +1496,7 @@ class ZVMDriver(driver.ComputeDriver):
         """Capture disk."""
         zvm_inst = ZVMInstance(self, instance)
         image_name = ''.join('rsz' + instance['name'])
-        image_uuid = str(uuid.uuid4())
+        image_uuid = str(uuidutils.generate_uuid())
         image_href = image_uuid.replace('-', '_')
 
         # Capture
diff --git a/test-requirements.txt b/test-requirements.txt
index 21fdf43..88d195d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,3 +14,4 @@ testscenarios>=0.4
 testtools>=1.4.0
 mock>=1.2
 mox>=0.5.3
+vine