apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

correctly use session in plugin

Browse Source
This commit is contained in:
anthony 2010-08-29 23:59:33 -07:00
parent 93b56fec8c
commit 5d8cadb7b0
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -4516,8 +4516,6 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
s_logger.warn(msg); s_logger.warn(msg);
return new Answer(cmd, false, msg); return new Answer(cmd, false, msg);
} }
sr.setNameLabel(conn, pool.getUuid());
sr.setNameDescription(conn, pool.getName());
long capacity = sr.getPhysicalSize(conn); long capacity = sr.getPhysicalSize(conn);
long available = capacity - sr.getPhysicalUtilisation(conn); long available = capacity - sr.getPhysicalUtilisation(conn);
if (capacity == -1) { if (capacity == -1) {

4
scripts/vm/hypervisor/xenserver/hostvmstats.py
View File

@ -12,14 +12,14 @@ def get_stats(session, collect_host_stats, consolidation_function, interval, sta
if collect_host_stats == "true" : if collect_host_stats == "true" :
url = "http://localhost/rrd_updates?" url = "http://localhost/rrd_updates?"
url += "session_id=" + session url += "session_id=" + session._session
url += "&host=" + collect_host_stats url += "&host=" + collect_host_stats
url += "&cf=" + consolidation_function url += "&cf=" + consolidation_function
url += "&interval=" + str(interval) url += "&interval=" + str(interval)
url += "&start=" + str(int(time.time())-100) url += "&start=" + str(int(time.time())-100)
else : else :
url = "http://localhost/rrd_updates?" url = "http://localhost/rrd_updates?"
url += "session_id=" + session url += "session_id=" + session._session
url += "&host=" + collect_host_stats url += "&host=" + collect_host_stats
url += "&cf=" + consolidation_function url += "&cf=" + consolidation_function
url += "&interval=" + str(interval) url += "&interval=" + str(interval)

6
scripts/vm/hypervisor/xenserver/vmops
View File

@ -38,9 +38,9 @@ def echo(fn):
def get_xapi_session(): def get_xapi_session():
xapi = XenAPI.xapi_local(); session = XenAPI.xapi_local();
xapi.login_with_password("","") session.login_with_password("","")
return xapi._session return session
@echo @echo
def gethostvmstats(session, args): def gethostvmstats(session, args):

1
scripts/vm/hypervisor/xenserver/xenserver56/patch
View File

@ -19,7 +19,6 @@ patch.tgz=..,0775,/opt/xensource/bin
vmops=..,0755,/etc/xapi.d/plugins vmops=..,0755,/etc/xapi.d/plugins
vmopsSnapshot=..,0755,/etc/xapi.d/plugins vmopsSnapshot=..,0755,/etc/xapi.d/plugins
xs_cleanup.sh=..,0755,/opt/xensource/bin xs_cleanup.sh=..,0755,/opt/xensource/bin
systemvm-premium.iso=../../../../../vms,0644,/opt/xensource/packages/iso
systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
hostvmstats.py=..,0755,/opt/xensource/sm hostvmstats.py=..,0755,/opt/xensource/sm
id_rsa.cloud=..,0600,/opt/xensource/bin id_rsa.cloud=..,0600,/opt/xensource/bin