parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 109 Wiki Activity

Fix some problems with modify command after split

This commit is contained in:
Joshua Boniface 2018-09-25 02:32:08 -04:00
parent 9107e16c33
commit 1c9c63db92
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cli-client/pvc.py
View File

@ -22,6 +22,12 @@
import socket import socket
import click import click
import tempfile
import os
import subprocess
import difflib
import re
import colorama
import client_lib.common as pvc_common import client_lib.common as pvc_common
import client_lib.node as pvc_node import client_lib.node as pvc_node
@ -291,6 +297,7 @@ def vm_modify(domain, config, editor, restart):
dom_uuid = pvc_vm.getDomainUUID(zk_conn, domain) dom_uuid = pvc_vm.getDomainUUID(zk_conn, domain)
if dom_uuid == None: if dom_uuid == None:
cleanup(False, 'ERROR: Could not find VM "{}" in the cluster!'.format(domain)) cleanup(False, 'ERROR: Could not find VM "{}" in the cluster!'.format(domain))
dom_name = pvc_vm.getDomainName(zk_conn, dom_uuid)
# Grab the current config # Grab the current config
current_vm_config = zk_conn.get('/domains/{}/xml'.format(dom_uuid))[0].decode('ascii') current_vm_config = zk_conn.get('/domains/{}/xml'.format(dom_uuid))[0].decode('ascii')
@ -342,9 +349,9 @@ def vm_modify(domain, config, editor, restart):
new_vm_config = config.read() new_vm_config = config.read()
config.close() config.close()
click.echo('Replacing config of VM "{}".'.format(dom_name, config)) click.echo('Replacing config of VM "{}" with file "{}".'.format(dom_name, config))
retcode, retmsg = pvc_vm.modify_vm(zk_conn, domain, restart) retcode, retmsg = pvc_vm.modify_vm(zk_conn, domain, restart, new_vm_config)
cleanup(retcode, retmsg, zk_conn) cleanup(retcode, retmsg, zk_conn)
############################################################################### ###############################################################################

3
client-common/client_lib/vm.py
View File

@ -218,10 +218,11 @@ def define_vm(zk_conn, config_data, target_hypervisor, selector):
return True, '' return True, ''
def modify_vm(zk_conn, domain, restart): def modify_vm(zk_conn, domain, restart, new_vm_config):
dom_uuid = getDomainUUID(zk_conn, domain) dom_uuid = getDomainUUID(zk_conn, domain)
if dom_uuid == None: if dom_uuid == None:
return False, 'ERROR: Could not find VM "{}" in the cluster!'.format(domain) return False, 'ERROR: Could not find VM "{}" in the cluster!'.format(domain)
dom_name = getDomainName(zk_conn, domain)
# Add the modified config to Zookeeper # Add the modified config to Zookeeper
transaction = zk_conn.transaction() transaction = zk_conn.transaction()