Skip to content

Clean up Python code; Python 2 to 3 #8993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 2 commits into from
Dec 23, 2024
Merged

Clean up Python code; Python 2 to 3 #8993

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb4efca
Clean up Python code; Python `2` to `3`
jbampton Apr 26, 2024
3dc23bc
Merge branch 'main' into python-2-to-3-clean-up
jbampton Dec 20, 2024
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
83 changes: 41 additions & 42 deletions plugins/hypervisors/ovm3/src/test/resources/scripts/create_pool_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

try:
if normalRepo:
print "normal repo"
print("normal repo")
# this literally throws EVERYTHING away on the repo
repoDom = parseString(server.discover_repository_db())
for node in repoDom.getElementsByTagName('Repository'):
Expand All @@ -43,16 +43,16 @@
# in which repo it lives....
for dirname, dirnames, filenames in os.walk('%s/VirtualMachines/' % localMount):
for vm in dirnames:
print "Destroying vm: %s on repo %s" % (vm, repoUuid.value)
print("Destroying vm: %s on repo %s" % (vm, repoUuid.value))
try:
mVm = server.list_vm(repoUuid.value, vm)
if mVm != None:
print server.stop_vm(repoUuid.value, vm)
print server.delete_vm(repoUuid.value, vm)
if mVm is not None:
print(server.stop_vm(repoUuid.value, vm))
print(server.delete_vm(repoUuid.value, vm))
else:
print "%s already not in repo %s" % (repoUuid.value, vm)
except Error, v:
print "Unable to destroy: %s" % (v)
print("%s already not in repo %s" % (repoUuid.value, vm))
except Error as v:
print("Unable to destroy: %s" % v)
continue

# VMs = server.list_vms()
Expand All @@ -63,15 +63,15 @@

rc = server.delete_repository(repoUuid.value, True)
# Set to false if you want to keep data: ^^^^
print "Repository: %s" % repoUuid.value
if (rc == None):
print "Ok repo: %s destroyed!" % repoUuid.value
print("Repository: %s" % repoUuid.value)
if rc is None:
print("Ok repo: %s destroyed!" % repoUuid.value)
# now unmount the FS
# print server.unmount_repository_fs(localMount)
else:
print "Failed repo: %s not destroyed!" % repoUuid.value
print("Failed repo: %s not destroyed!" % repoUuid.value)

# for now only treat NFS stuff as we're testing with that..
# for now only treat NFS stuff as we're testing with that.
nfsHost = 'cs-mgmt'
nfsDom = server.storage_plugin_listMountPoints(
'oracle.generic.NFSPlugin.GenericNFSPlugin',
Expand Down Expand Up @@ -111,19 +111,18 @@
nfsDom = parseString(server.discover_mounted_file_systems('nfs'))
for node in nfsDom.getElementsByTagName('Mount'):
nfsMnt = node.attributes['Dir'].value
print 'Mountpoint: %s' % (nfsMnt)
print('Mountpoint: %s' % nfsMnt)
fsStamp = '%s/.generic_fs_stamp' % nfsMnt
# remove this so we don't cock up next run
if os.path.isfile(fsStamp):
print "Stamp found: %s" % fsStamp
print("Stamp found: %s" % fsStamp)
os.unlink(fsStamp)

rc = server.storage_plugin_unmount('oracle.generic.NFSPlugin.GenericNFSPlugin', props, extprops, nfsMnt, True)
print rc

print(rc)

if pooledFs:
print "pooling"
print("pooling")
# pool stuff
poolalias = "ItsMyPool"
poolmvip = "192.168.1.161"
Expand Down Expand Up @@ -153,60 +152,60 @@
# eventually cluster cleanup can be done by removing
# stuff from /etc/ovs-agent/db
# also clean /etc/ocfs2/cluster.conf
print server.create_pool_filesystem(
print(server.create_pool_filesystem(
fstype,
fstarget,
clusterid,
poolfsuuid,
poolfsnfsbaseuuid,
manageruuid,
pooluuid
)
))

# poolDom = server.discover_server_pool()
# print poolDom
# poolDom = parseString(server.discover_server_pool())
# if poolDom.getElementsByTagName('Server_Pool'):
# get unique id
cluster = server.is_cluster_online()
if cluster == True:
print "clean up pool"
if cluster:
print("clean up pool")
# print server.destroy_cluster(poolfsuuid)
# deconfigure cluster
# print server.destroy_server_pool(poolid)

if cluster == False:
print "create_server_pool"
if not cluster:
print("create_server_pool")
# first take ownership. without an owner nothing happens
print server.take_ownership(manageruuid, "")
print(server.take_ownership(manageruuid, ""))
# we need to add the first host first to the pool....
poolDom = server.discover_server_pool()
print poolDom
print(poolDom)
poolDom = parseString(server.discover_server_pool())
if poolDom.getElementsByTagName('Server_Pool'):
print server.destroy_server_pool(pooluuid)
print(server.destroy_server_pool(pooluuid))

print server.create_pool_filesystem(
print(server.create_pool_filesystem(
fstype,
fstarget,
clusterid,
poolfsuuid,
poolfsnfsbaseuuid,
manageruuid,
pooluuid
)
print server.create_server_pool(poolalias,
))
print(server.create_server_pool(poolalias,
pooluuid,
poolmvip,
poolfirsthost['id'],
poolfirsthost['hn'],
poolfirsthost['ip'],
poolfirsthost['role'])
poolfirsthost['role']))

print "configure_virtual_ip"
print("configure_virtual_ip")
server.configure_virtual_ip(poolmvip, poolfirsthost['ip'])
server.set_pool_member_ip_list(['192.168.1.64', '192.168.1.65'],)
print "configure for cluster"
print("configure for cluster")
server.configure_server_for_cluster(
{
'O2CB_HEARTBEAT_THRESHOLD': '61',
Expand Down Expand Up @@ -247,25 +246,25 @@
poolfsuuid,
poolfsnfsbaseuuid
)
print "create cluster"
print("create cluster")
server.create_cluster(poolfsuuid,)

poolDom = parseString(server.discover_server_pool())
for node in poolDom.getElementsByTagName('Server_Pool'):
id = node.getElementsByTagName('Unique_Id')[0].firstChild.nodeValue
alias = node.getElementsByTagName('Pool_Alias')[0].firstChild.nodeValue
mvip = node.getElementsByTagName('Primary_Virtual_Ip')[0].firstChild.nodeValue
print "pool: %s, %s, %s" % (id, mvip, alias)
print("pool: %s, %s, %s" % (id, mvip, alias))
members = node.getElementsByTagName('Member')
for member in members:
mip = member.getElementsByTagName('Registered_IP')[0].firstChild.nodeValue
print "member: %s" % (mip)
print("member: %s" % mip)

print server.is_cluster_online()
print server.discover_cluster()
print server.discover_pool_filesystem()
print server.discover_server_pool()
print(server.is_cluster_online())
print(server.discover_cluster())
print(server.discover_pool_filesystem())
print(server.discover_server_pool())
# server.destroy_server_pool(pooluuid)

except Error, v:
print "ERROR", v
except Error as v:
print("ERROR", v)
Loading