cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject [3/5] git commit: updated refs/heads/4.2 to 4918e21
Date Thu, 14 Nov 2013 03:03:38 GMT
Revert "Removed the hostvmstats method call from the xs plugin vmops in xcposs"

This reverts commit c0602d661a53d751056e6ebf4d6cc5a61918bf00.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aee7603a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aee7603a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aee7603a

Branch: refs/heads/4.2
Commit: aee7603abbb11c51327d241a0354fdd1a0826f92
Parents: d8e2f6b
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Wed Nov 13 19:00:12 2013 -0800
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Wed Nov 13 19:00:12 2013 -0800

----------------------------------------------------------------------
 scripts/vm/hypervisor/xenserver/xcposs/vmops | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aee7603a/scripts/vm/hypervisor/xenserver/xcposs/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xcposs/vmops b/scripts/vm/hypervisor/xenserver/xcposs/vmops
index 2f6441a..c5a9f94 100644
--- a/scripts/vm/hypervisor/xenserver/xcposs/vmops
+++ b/scripts/vm/hypervisor/xenserver/xcposs/vmops
@@ -24,6 +24,7 @@ import os, sys, time
 import XenAPIPlugin
 sys.path.extend(["/usr/lib/xcp/sm/", "/usr/local/sbin/", "/sbin/"])
 import base64
+import hostvmstats
 import socket
 import stat
 import tempfile
@@ -42,6 +43,15 @@ def echo(fn):
     return wrapped
 
 @echo
+def gethostvmstats(session, args):
+    collect_host_stats = args['collectHostStats']
+    consolidation_function = args['consolidationFunction']
+    interval = args['interval']
+    start_time = args['startTime']
+    result = hostvmstats.get_stats(session, collect_host_stats, consolidation_function, interval,
start_time)
+    return result
+    
+@echo
 def setup_iscsi(session, args):
    uuid=args['uuid']
    try:
@@ -1460,7 +1470,7 @@ def getDomRVersion(session, args):
     return txt
 
 if __name__ == "__main__":
-     XenAPIPlugin.dispatch({"pingtest": pingtest, "setup_iscsi":setup_iscsi,  
+     XenAPIPlugin.dispatch({"pingtest": pingtest, "setup_iscsi":setup_iscsi, "gethostvmstats":
gethostvmstats, 
                             "getgateway": getgateway, "preparemigration": preparemigration,

                             "setIptables": setIptables, "pingdomr": pingdomr, "pingxenserver":
pingxenserver,  
                             "ipassoc": ipassoc, "savePassword": savePassword, 


Mime
View raw message