You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/11/11 17:24:12 UTC
[3/5] git commit: updated refs/heads/4.2 to 1c3b9b5
Removed the hostvmstats.py file from the scripts and from all of patch files and from vmops
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eb19545d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eb19545d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eb19545d
Branch: refs/heads/4.2
Commit: eb19545dc0f601cd87e68698e8dc71f31080696c
Parents: e82e142
Author: Alex Huang <al...@citrix.com>
Authored: Mon Nov 11 02:27:13 2013 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Mon Nov 11 08:24:04 2013 -0800
----------------------------------------------------------------------
scripts/vm/hypervisor/xenserver/hostvmstats.py | 52 --------------------
scripts/vm/hypervisor/xenserver/vmops | 12 +----
.../vm/hypervisor/xenserver/xenserver56/patch | 1 -
.../hypervisor/xenserver/xenserver56fp1/patch | 1 -
.../vm/hypervisor/xenserver/xenserver60/patch | 1 -
5 files changed, 1 insertion(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb19545d/scripts/vm/hypervisor/xenserver/hostvmstats.py
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/hostvmstats.py b/scripts/vm/hypervisor/xenserver/hostvmstats.py
deleted file mode 100644
index 38609b1..0000000
--- a/scripts/vm/hypervisor/xenserver/hostvmstats.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb19545d/scripts/vm/hypervisor/xenserver/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index 3f11960..48ca422 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -24,7 +24,6 @@ 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
@@ -55,15 +54,6 @@ def add_to_VCPUs_params_live(session, args):
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']
try:
@@ -1629,7 +1619,7 @@ def bumpUpPriority(session, args):
if __name__ == "__main__":
- XenAPIPlugin.dispatch({"pingtest": pingtest, "setup_iscsi":setup_iscsi, "gethostvmstats": gethostvmstats,
+ XenAPIPlugin.dispatch({"pingtest": pingtest, "setup_iscsi":setup_iscsi,
"getgateway": getgateway, "preparemigration": preparemigration,
"setIptables": setIptables, "pingdomr": pingdomr, "pingxenserver": pingxenserver,
"savePassword": savePassword,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb19545d/scripts/vm/hypervisor/xenserver/xenserver56/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/patch b/scripts/vm/hypervisor/xenserver/xenserver56/patch
index 87b3937..db2de3e 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver56/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver56/patch
@@ -29,7 +29,6 @@
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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb19545d/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
index 6dc9b05..3206a34 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
@@ -29,7 +29,6 @@
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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb19545d/scripts/vm/hypervisor/xenserver/xenserver60/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver60/patch b/scripts/vm/hypervisor/xenserver/xenserver60/patch
index 60a0643..457bb26 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver60/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver60/patch
@@ -34,7 +34,6 @@ 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