[cloudstack] branch master updated: CLOUDSTACK-10177: Only pass IPv6 address to Security Group Python script if present (#2355)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new be3a39e  CLOUDSTACK-10177: Only pass IPv6 address to Security Group 
Python script if present (#2355)
be3a39e is described below

commit be3a39ea4fcb1f758d72c4e4abc43f428845c4d1
Author: Wido den Hollander <w...@widodh.nl>
AuthorDate: Mon Dec 11 17:17:50 2017 +0100

    CLOUDSTACK-10177: Only pass IPv6 address to Security Group Python script if 
present (#2355)
    
    Otherwise we send down a 'null' to a ProcessBuilder in Java instead of a 
String and this
    causes a NPE.
    
    We should check first if the Instance has a IPv6 address before sending it 
there.
    
    Signed-off-by: Wido den Hollander <w...@widodh.nl>
---
 .../com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 7794249..952fe9e 100644
--- 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3478,7 +3478,9 @@ public class LibvirtComputingResource extends 
ServerResourceBase implements Serv
         cmd.add("--vmname", vmName);
         cmd.add("--vmid", vmId);
         cmd.add("--vmip", guestIP);
-        cmd.add("--vmip6", guestIP6);
+        if (StringUtils.isNotBlank(guestIP6)) {
+            cmd.add("--vmip6", guestIP6);
+        }
         cmd.add("--sig", sig);
         cmd.add("--seq", seq);
         cmd.add("--vmmac", mac);

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].