Revert "Removed the hostvmstats.py file from the scripts and from all of patch files and from vmops"

This reverts commit eb19545dc0.

scripts/vm/hypervisor/xenserver/hostvmstats.py

@@ -0,0 +1,52 @@
+#!/usr/bin/python
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# $Id: hostvmstats.py 10054 2010-06-29 22:09:31Z abhishek $ $HeadURL: svn://svn.lab.vmops.com/repos/vmdev/java/scripts/vm/hypervisor/xenserver/hostvmstats.py $
+
+import XenAPI
+import urllib
+import time
+import logging
+logging.basicConfig(filename='/tmp/xapilog',level=logging.DEBUG)
+                      
+def get_stats(session, collect_host_stats, consolidation_function, interval, start_time):
+  try:
+    
+    if collect_host_stats == "true" :
+    	url = "http://localhost/rrd_updates?"
+   	url += "session_id=" + session._session
+   	url += "&host=" + collect_host_stats
+    	url += "&cf=" + consolidation_function
+    	url += "&interval=" + str(interval)
+    	url += "&start=" + str(int(time.time())-100)
+    else :
+    	url = "http://localhost/rrd_updates?"
+   	url += "session_id=" + session._session
+   	url += "&host=" + collect_host_stats
+    	url += "&cf=" + consolidation_function
+    	url += "&interval=" + str(interval)
+    	url += "&start=" + str(int(time.time())-100)
+
+    logging.debug("Calling URL: %s",url)
+    sock = urllib.URLopener().open(url)
+    xml = sock.read()
+    sock.close()
+    logging.debug("Size of returned XML: %s",len(xml))
+    return xml
+  except Exception,e:
+    logging.exception("get_stats() failed")
+    raise

scripts/vm/hypervisor/xenserver/vmops

@@ -24,6 +24,7 @@ import os, sys, time
 import XenAPIPlugin
 sys.path.extend(["/opt/xensource/sm/", "/usr/local/sbin/", "/sbin/"])
 import base64
+import hostvmstats
 import socket
 import stat
 import tempfile
@@ -53,6 +54,15 @@ def add_to_VCPUs_params_live(session, args):
         return 'false'
     return 'true'
 
+@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']
@@ -1619,7 +1629,7 @@ def bumpUpPriority(session, args):
 
 
 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,  
                             "savePassword": savePassword, 

scripts/vm/hypervisor/xenserver/xenserver56/patch

@@ -29,6 +29,7 @@
 NFSSR.py=/opt/xensource/sm
 vmops=..,0755,/etc/xapi.d/plugins
 vmopsSnapshot=..,0755,/etc/xapi.d/plugins
+hostvmstats.py=..,0755,/opt/xensource/sm
 systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
 id_rsa.cloud=../../../systemvm,0600,/root/.ssh
 network_info.sh=..,0755,/opt/xensource/bin

scripts/vm/hypervisor/xenserver/xenserver56fp1/patch

@@ -29,6 +29,7 @@
 NFSSR.py=/opt/xensource/sm
 vmops=..,0755,/etc/xapi.d/plugins
 vmopsSnapshot=..,0755,/etc/xapi.d/plugins
+hostvmstats.py=..,0755,/opt/xensource/sm
 systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
 id_rsa.cloud=../../../systemvm,0600,/root/.ssh
 network_info.sh=..,0755,/opt/xensource/bin

scripts/vm/hypervisor/xenserver/xenserver60/patch

@@ -34,6 +34,7 @@ cloudstack_plugins.conf=..,0644,/etc/xensource
 cloudstack_pluginlib.py=..,0755,/etc/xapi.d/plugins
 ovstunnel=..,0755,/etc/xapi.d/plugins
 vmopsSnapshot=..,0755,/etc/xapi.d/plugins
+hostvmstats.py=..,0755,/opt/xensource/sm
 systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
 id_rsa.cloud=../../../systemvm,0600,/root/.ssh
 network_info.sh=..,0755,/opt/xensource/bin