From 27b8e9db04ace36859aba98b1e6c862563ae1b35 Mon Sep 17 00:00:00 2001
From: Jerry Cai <caimin@cn.ibm.com>
Date: Tue, 22 Nov 2016 15:41:12 +0800
Subject: [PATCH] Add support to pvc 131 and 132

Add support to pvc 131 and 132

Change-Id: I752f53f9d8abebab0de86890edd70b17d30b0297
Closes-Bug: #1643787
---
 common-powervc/powervc/common/client/extensions/nova.py  | 4 ++--
 nova-powervc/powervc/nova/driver/compute/manager.py      | 2 +-
 nova-powervc/powervc/nova/driver/virt/powervc/service.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common-powervc/powervc/common/client/extensions/nova.py b/common-powervc/powervc/common/client/extensions/nova.py
index f20992a..4d575d3 100644
--- a/common-powervc/powervc/common/client/extensions/nova.py
+++ b/common-powervc/powervc/common/client/extensions/nova.py
@@ -246,8 +246,8 @@ class PVCServerManager(servers.ServerManager):
         body["server"]["flavor"]['extra_specs'] = flavor['extra_specs']
 
         # If hypervisor ID specified:
-        if kwargs.get("hypervisor", None):
-            body["server"]['hypervisor_hostname'] = kwargs["hypervisor"]
+        #if kwargs.get("hypervisor", None):
+        #    body["server"]['hypervisor_hostname'] = kwargs["hypervisor"]
 
         if userdata:
             # RTC/172018 -- start
diff --git a/nova-powervc/powervc/nova/driver/compute/manager.py b/nova-powervc/powervc/nova/driver/compute/manager.py
index 6df50c4..050604c 100644
--- a/nova-powervc/powervc/nova/driver/compute/manager.py
+++ b/nova-powervc/powervc/nova/driver/compute/manager.py
@@ -992,7 +992,7 @@ class PowerVCCloudManager(manager.Manager):
                                                    "PowerVC flavor"
                                                    " that fits "
                                                    "into the resource "
-                                                   "instance instead"), rtn)
+                                                   "instance instead"))
                                         break
                     except Exception:
                         if rtn is None:
diff --git a/nova-powervc/powervc/nova/driver/virt/powervc/service.py b/nova-powervc/powervc/nova/driver/virt/powervc/service.py
index a8fff41..f2363b8 100644
--- a/nova-powervc/powervc/nova/driver/virt/powervc/service.py
+++ b/nova-powervc/powervc/nova/driver/virt/powervc/service.py
@@ -899,7 +899,7 @@ class PowerVCService(object):
 
         flavor_props = {'vcpus': flavor['vcpus'],
                         'ram': flavor['memory_mb'],
-                        'disk': flavor['root_gb'],
+                        'disk': getattr(server, 'root_gb', flavor['root_gb']),
                         'extra_specs': flavor_extras_target
                         }