You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/10/21 19:54:23 UTC

git commit: updated refs/heads/master to fbe205b

Repository: cloudstack
Updated Branches:
  refs/heads/master 2e4502070 -> fbe205b9d


remove unused XS plugins


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

Branch: refs/heads/master
Commit: fbe205b9dd3cb8eca1c7247c70d1960080ffc870
Parents: 2e45020
Author: Anthony Xu <an...@citrix.com>
Authored: Tue Oct 21 10:53:06 2014 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Tue Oct 21 10:53:48 2014 -0700

----------------------------------------------------------------------
 scripts/vm/hypervisor/xenserver/vmops        | 13 +-----------
 scripts/vm/hypervisor/xenserver/xcposs/vmops | 25 ++---------------------
 2 files changed, 3 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fbe205b9/scripts/vm/hypervisor/xenserver/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index cf9d377..f224c1d 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -72,17 +72,6 @@ def setup_iscsi(session, args):
  
 
 @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']
     try:
@@ -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, 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fbe205b9/scripts/vm/hypervisor/xenserver/xcposs/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xcposs/vmops b/scripts/vm/hypervisor/xenserver/xcposs/vmops
index 1792a46..3581aa7 100644
--- a/scripts/vm/hypervisor/xenserver/xcposs/vmops
+++ b/scripts/vm/hypervisor/xenserver/xcposs/vmops
@@ -43,15 +43,6 @@ 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:
@@ -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,