Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
73e5576
schema: add XS 8.3, 8.4 hypervisor capabilities
yadvr Feb 28, 2025
78da6ec
fix os mappings
yadvr Feb 28, 2025
b73bc69
fix more mappings
yadvr Feb 28, 2025
31123e3
fix os mappings order
yadvr Feb 28, 2025
9a99c43
Use Python3 for Xenserver 8.4
Pearl1594 Apr 9, 2025
5e2afc3
Merge branch '4.20' of https://github.com/apache/cloudstack into supp…
Pearl1594 Apr 9, 2025
2b69003
add license
Pearl1594 Apr 9, 2025
37d1704
fix linter
Pearl1594 Apr 9, 2025
a098060
add more py3 scripts for xen 8.4
Pearl1594 Apr 10, 2025
e5e80ae
prevent systemwide py3 change and address linter issues
Pearl1594 Apr 10, 2025
2502888
address linter issue
Pearl1594 Apr 10, 2025
5ee3ace
add more files
Pearl1594 Apr 10, 2025
b3057cf
linter fixes
Pearl1594 Apr 10, 2025
cc52c70
add another py3 file
Pearl1594 Apr 10, 2025
e8828e5
change base class
Pearl1594 Apr 10, 2025
0bd2f28
add xcp83 resource and appropriate patch file for py3 compatibility
Pearl1594 Apr 11, 2025
040d878
add license
Pearl1594 Apr 11, 2025
75a8e44
Add logic to skip mounting guest tools if xs version >= 8.2
Pearl1594 Apr 11, 2025
b0e52d2
Merge branch '4.20' of https://github.com/apache/cloudstack into supp…
Pearl1594 Apr 18, 2025
75c9fff
fix test test_guest_os due to missing template on xen 8.4
Pearl1594 Apr 21, 2025
8ff139e
xen-api: use https://mvnrepository.com/artifact/com.citrix.hypervisor…
weizhouapache Apr 22, 2025
35a30f2
fix to allow hosts to get added
Pearl1594 Apr 23, 2025
f28700b
update script with missing method in built in scripts SR.py and make …
Pearl1594 Apr 23, 2025
3bec407
update nfssr script as there are missing parameters
Pearl1594 Apr 23, 2025
63fb4f3
add missing plugin required for xcp 8.3
Pearl1594 Apr 23, 2025
3059871
fix issue with sysvm volume creation - [SR_BACKEND_FAILURE_1200statvf…
Pearl1594 Apr 23, 2025
f1128a0
Merge branch '4.20' of https://github.com/apache/cloudstack into supp…
Pearl1594 Apr 25, 2025
7f98ca1
Merge branch '4.20' of https://github.com/apache/cloudstack into supp…
Pearl1594 Apr 29, 2025
cdf6358
fix test for xcp 8.3
Pearl1594 Apr 29, 2025
2228fe7
Merge branch '4.20' of https://github.com/apache/cloudstack into supp…
Pearl1594 Apr 30, 2025
3509d13
Fix test when passing extra config
Pearl1594 Apr 30, 2025
84ea6ce
update folder path permission
Pearl1594 May 1, 2025
1ae4276
Merge branch '4.20' of https://github.com/apache/cloudstack into supp…
Pearl1594 May 5, 2025
c2d1990
Merge branch '4.20' of https://github.com/apache/cloudstack into supp…
Pearl1594 May 8, 2025
2d800df
add missing guest OS mappings
Pearl1594 May 8, 2025
0c8a738
update guest os category
Pearl1594 May 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
linter fixes
  • Loading branch information
Pearl1594 committed Apr 10, 2025
commit b3057cf30e24b29502824431b86e1a0fc93be823
18 changes: 9 additions & 9 deletions scripts/vm/hypervisor/xenserver/xenserver84/vmopspremium
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env python3
#!/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
Expand All @@ -18,7 +18,7 @@

# Version @VERSION@
#
# A plugin for executing script needed by vmops cloud
# A plugin for executing script needed by vmops cloud

import os, sys, time
import XenAPIPlugin
Expand Down Expand Up @@ -133,17 +133,17 @@ def setup_heartbeat_file(session, args):
txt = ''
return txt


@echo
def heartbeat(session, args):
host = args['host']
timeout = args['timeout']
interval = args['interval']
try:
cmd = ["/bin/bash", "/opt/cloud/bin/launch_hb.sh", host, timeout, interval]
txt = util.pread2(cmd)
try:
cmd = ["/bin/bash", "/opt/cloud/bin/launch_hb.sh", host, timeout, interval]
txt = util.pread2(cmd)
except:
txt='fail'
txt='fail'
return txt

@echo
Expand Down
Loading