From 50c6bd77a0a25caa83c4d2e3fc452d1062bd66a6 Mon Sep 17 00:00:00 2001 From: kishan Date: Tue, 14 Aug 2012 16:36:29 +0530 Subject: [PATCH] bug CS-15984: parse and return stats for network usage command with vpn option status CS-15984: resolved fixed --- .../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 2 +- .../com/cloud/hypervisor/xen/resource/XenServer56Resource.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index d7b0e9bf236..80458e13256 100755 --- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -548,7 +548,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa throw new Exception(" vpc network usage plugin call failed "); } - if (option.equals("get")) { + if (option.equals("get") || option.equals("vpn")) { String result = resultPair.second(); if (result == null || result.isEmpty()) { throw new Exception(" vpc network usage get returns empty "); diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java index bf486376f2a..fb1a1362942 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java +++ b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java @@ -189,7 +189,7 @@ public class XenServer56Resource extends CitrixResourceBase { } String result = callHostPlugin(conn, "vmops", "routerProxy", "args", args); - if (option.equals("get")) { + if (option.equals("get") || option.equals("vpn")) { long[] stats = new long[2]; if (result != null) { String[] splitResult = result.split(":");