From 63fc767a70d62c74d8b84c0bc716dc8bc73211f6 Mon Sep 17 00:00:00 2001 From: anthony Date: Mon, 18 Jun 2012 19:09:10 -0700 Subject: [PATCH] VPC : disable Network-usage for vpc, will revisit later --- api/src/com/cloud/agent/api/NetworkUsageCommand.java | 8 ++++++++ .../hypervisor/xen/resource/XenServer56Resource.java | 3 +++ 2 files changed, 11 insertions(+) diff --git a/api/src/com/cloud/agent/api/NetworkUsageCommand.java b/api/src/com/cloud/agent/api/NetworkUsageCommand.java index 18555378562..4121b8a51bb 100644 --- a/api/src/com/cloud/agent/api/NetworkUsageCommand.java +++ b/api/src/com/cloud/agent/api/NetworkUsageCommand.java @@ -55,6 +55,14 @@ public class NetworkUsageCommand extends Command { return option; } + public boolean isForVpc() { + return forVpc; + } + + public NicTO getGuestNic() { + return guestNic; + } + @Override public boolean executeInSequence() { return false; diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java index 4ad276f99a3..d76b5bc0b9e 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java +++ b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java @@ -162,6 +162,9 @@ public class XenServer56Resource extends CitrixResourceBase { protected NetworkUsageAnswer execute(NetworkUsageCommand cmd) { try { + if ( cmd.isForVpc() ) { + return new NetworkUsageAnswer(cmd, "seccess", 0L, 0L); + } Connection conn = getConnection(); if(cmd.getOption()!=null && cmd.getOption().equals("create") ){ String result = networkUsage(conn, cmd.getPrivateIP(), "create", null);