From fbe205b9dd3cb8eca1c7247c70d1960080ffc870 Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Tue, 21 Oct 2014 10:53:06 -0700 Subject: [PATCH] remove unused XS plugins --- scripts/vm/hypervisor/xenserver/vmops | 13 +--------- scripts/vm/hypervisor/xenserver/xcposs/vmops | 25 ++------------------ 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index cf9d3773a9a..f224c1d3b1a 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -71,17 +71,6 @@ def setup_iscsi(session, args): return txt -@echo -def getgateway(session, args): - mgmt_ip = args['mgmtIP'] - try: - cmd = ["bash", "/opt/cloud/bin/network_info.sh", "-g", mgmt_ip] - txt = util.pread2(cmd) - except: - txt = '' - - return txt - @echo def preparemigration(session, args): uuid = args['uuid'] @@ -1487,7 +1476,7 @@ def network_rules(session, args): if __name__ == "__main__": XenAPIPlugin.dispatch({"pingtest": pingtest, "setup_iscsi":setup_iscsi, - "getgateway": getgateway, "preparemigration": preparemigration, + "preparemigration": preparemigration, "setIptables": setIptables, "pingdomr": pingdomr, "pingxenserver": pingxenserver, "createFile": createFile, "deleteFile": deleteFile, "network_rules":network_rules, diff --git a/scripts/vm/hypervisor/xenserver/xcposs/vmops b/scripts/vm/hypervisor/xenserver/xcposs/vmops index 1792a46773b..3581aa76a7a 100644 --- a/scripts/vm/hypervisor/xenserver/xcposs/vmops +++ b/scripts/vm/hypervisor/xenserver/xcposs/vmops @@ -42,15 +42,6 @@ def echo(fn): return res 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'] @@ -61,18 +52,6 @@ def setup_iscsi(session, args): txt = '' return '> DONE <' - -@echo -def getgateway(session, args): - mgmt_ip = args['mgmtIP'] - try: - cmd = ["bash", "/opt/cloud/bin/network_info.sh", "-g", mgmt_ip] - txt = util.pread2(cmd) - except: - txt = '' - - return txt - @echo def preparemigration(session, args): uuid = args['uuid'] @@ -1457,8 +1436,8 @@ def getDomRVersion(session, args): return txt if __name__ == "__main__": - XenAPIPlugin.dispatch({"pingtest": pingtest, "setup_iscsi":setup_iscsi, "gethostvmstats": gethostvmstats, - "getgateway": getgateway, "preparemigration": preparemigration, + XenAPIPlugin.dispatch({"pingtest": pingtest, "setup_iscsi":setup_iscsi, + "preparemigration": preparemigration, "setIptables": setIptables, "pingdomr": pingdomr, "pingxenserver": pingxenserver, "ipassoc": ipassoc, "savePassword": savePassword, "saveDhcpEntry": saveDhcpEntry, "setFirewallRule": setFirewallRule,