Change in vdsm[master]: Add simple text-based console in vdsClient

List overview All Threads
Download

newer

older

Change in vdsm[master]: Allow...

Change in vdsm[master]: Add...

Xu He Jie

19 Sep 2012 19 Sep '12

7:15 a.m.

Xu He Jie has uploaded a new change for review.

Change subject: Add simple text-based console in vdsClient ......................................................................

Add simple text-based console in vdsClient

Add new command 'openConsole' in vdsClient. This command invoke 'virsh console' directly. This is easy implement for text-based console. It means we can have a vdsm text console right now. We can improve text console in futrue.

Change-Id: I368dbcbc2e180161f256f3fb450c344acb6a6c8a Signed-off-by: Xu He Jie xuhj@linux.vnet.ibm.com --- M vdsm_cli/vdsClient.py 1 file changed, 13 insertions(+), 0 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/8041/1

diff --git a/vdsm_cli/vdsClient.py b/vdsm_cli/vdsClient.py index fe2f083..e49e66a 100644 --- a/vdsm_cli/vdsClient.py +++ b/vdsm_cli/vdsClient.py @@ -24,6 +24,7 @@ import re import socket import pprint as pp +import subprocess

from vdsm import vdscli try: @@ -122,8 +123,10 @@ def __init__(self): self.useSSL = False self.truststore = None + self.server = "0"

def do_connect(self, server, port): + self.server = server self.s = vdscli.connect(server + ':' + port, self.useSSL, self.truststore)

@@ -1607,6 +1610,13 @@

return status['status']['code'], status['status']['message']

+ def openVmConsole(self, args): + protocol = "tls" if self.useSSL else "tcp" + conn = "qemu+" + protocol + "://" + self.server + "/system" + p = subprocess.Popen(["virsh", "-c", conn, "console", args[0]]) + p.wait() + + if __name__ == '__main__': if _glusterEnabled: serv = ge.GlusterService() @@ -2265,6 +2275,9 @@ ('<vmId> <sdUUID> <imgUUID> <baseVolUUID> <volUUID>', "Take a live snapshot" )), + 'openConsole': (serv.openVmConsole, + ("<vmName>", + "open pty console for vm")), } if _glusterEnabled: commands.update(ge.getGlusterCmdDict(serv))

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange Gerrit-Change-Id: I368dbcbc2e180161f256f3fb450c344acb6a6c8a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xu He Jie xuhj@linux.vnet.ibm.com

Show replies by date

Ryan Harper

20 Sep 20 Sep

3:30 p.m.

Ryan Harper has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 1: I would prefer that you didn't submit this

(2 inline comments)

.................................................... Commit Message Line 8: Line 9: Add new command 'openConsole' in vdsClient. This command Line 10: invoke 'virsh console' directly. This is easy implement for text-based Line 11: console. It means we can have a vdsm text console right now. Line 12: We can improve text console in futrue. s/futrue/future.

Also, we probably want to update the vdsm.spec file to indicate that vdsm-cli package depends on /bin/virsh. Line 13: Line 14: Change-Id: I368dbcbc2e180161f256f3fb450c344acb6a6c8a

.................................................... File vdsm_cli/vdsClient.py Line 122: class service: Line 123: def __init__(self): Line 124: self.useSSL = False Line 125: self.truststore = None Line 126: self.server = "0" Anything special about "0" or would None be sufficient? Line 127: Line 128: def do_connect(self, server, port): Line 129: self.server = server Line 130: self.s = vdscli.connect(server + ':' + port,

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment Gerrit-Change-Id: I368dbcbc2e180161f256f3fb450c344acb6a6c8a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xu He Jie xuhj@linux.vnet.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com Gerrit-Reviewer: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Zhou Zheng Sheng zhshzhou@linux.vnet.ibm.com

Xu He Jie

21 Sep 21 Sep

2:06 a.m.

Xu He Jie has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 1: (2 inline comments)

.................................................... File vdsm_cli/vdsClient.py Line 122: class service: Line 123: def __init__(self): Line 124: self.useSSL = False Line 125: self.truststore = None Line 126: self.server = "0" In the beginning, I think If it is None, we need another check in openVmConsole. like: if self.server == None: server = "0" conn = "qemu+" + protocol + "://" + self.server + "/system"

But most of the time server won't be None. We will do_connect first. If we didn't call do_connec firist, the "0" will cover this mistake.

So None is better.

Thanks Line 127: Line 128: def do_connect(self, server, port): Line 129: self.server = server Line 130: self.s = vdscli.connect(server + ':' + port,

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

shaohef＠linux.vnet.ibm.com

4:01 a.m.

ShaoHe Feng has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 1: (1 inline comment)

.................................................... File vdsm_cli/vdsClient.py Line 1612: Line 1613: def openVmConsole(self, args): Line 1614: protocol = "tls" if self.useSSL else "tcp" Line 1615: conn = "qemu+" + protocol + "://" + self.server + "/system" Line 1616: p = subprocess.Popen(["virsh", "-c", conn, "console", args[0]]) 1. Are libvirtd and virsh in same rpm packet? I did not check this. so, if not, should require virsh be installed? 2. this console is only human or for engine? Line 1617: p.wait() Line 1618: Line 1619: Line 1620: if __name__ == '__main__':

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

Xu He Jie

5:06 a.m.

Xu He Jie has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 1: (1 inline comment)

.................................................... File vdsm_cli/vdsClient.py Line 1612: Line 1613: def openVmConsole(self, args): Line 1614: protocol = "tls" if self.useSSL else "tcp" Line 1615: conn = "qemu+" + protocol + "://" + self.server + "/system" Line 1616: p = subprocess.Popen(["virsh", "-c", conn, "console", args[0]]) ShaoHe, you are right, I need add dependence for virsh. This is for human first. We will improve this later. Line 1617: p.wait() Line 1618: Line 1619: Line 1620: if __name__ == '__main__':

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

zhshzhou＠linux.vnet.ibm.com

26 Sep 26 Sep

3:38 a.m.

Zhou Zheng Sheng has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 2: Verified; I would prefer that you didn't submit this

(1 inline comment)

Successfully connect to the guest console, but I have some different ideas on the command design.

There are many ways to connect to libvirt. For example, when connecting to local libvirtd, sometimes neither tls nor tcp is enabled, and only unix socket is enabled. This code can not adapt to the above situation.

Secondly, self.useSSL is a flag for connecting vdsm, not a flag for connection to libvirt. We can connectI think it's not good to re-use a member variable for this different purpose. However re-using self.server as destination for virsh here is OK. The protocols for connecting vdsm and libvirt can be different, but the destination always the same.

Thirdly, we get the console by referring its name, I think UUID is more suitable here. The user refer to the VM by UUID, then vdsClient can firstly get the VM name from vdsm by UUID, then open a console to that VM by name. If we open a VM console by name, there is no difference for the user to use virsh directly.

So I think we can re-design the command as follow.

vdsClient [-s] host openVmConsole [tsl|tcp|socket] vm-uuid

If the [tls|tcp|socket] part is omitted, then the default transport is Unix socket. The disadvantage here is the transport detail is leaked to the user here, but we can not do better unless either the remote vdsm can tunnel a libvirt connection for us or vdsm can tell us the libvirtd transport related configurations. If it did, then more information is leaked out of vdsm, not good... If vdsm can provide a tunnel to console through xmlrpc or ssh as you implemented in the other patch, most of the problems I mentioned can be solved. Line 1619: Line 1620: Line 1621: if __name__ == '__main__': Line 1622: if _glusterEnabled:

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment Gerrit-Change-Id: I368dbcbc2e180161f256f3fb450c344acb6a6c8a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xu He Jie xuhj@linux.vnet.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com Gerrit-Reviewer: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Xu He Jie xuhj@linux.vnet.ibm.com Gerrit-Reviewer: Zhou Zheng Sheng zhshzhou@linux.vnet.ibm.com

Xu He Jie

29 Sep 29 Sep

1:56 a.m.

Xu He Jie has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 2: (1 inline comment)

For the frist and second question. In normally, we shouldn't access libvirt directly. But for we want to have console now, this is a simple implement. When ssl=false in vdsm.conf, vdsm will configure libvirt with tcp_listen=1 and tls_listen=0. When ssl=true, vdsm will configure libvirt with tcp_listen=1 and tls_listen=1. vdsClient is vdsm's client. vdsClient isn't a virsh, so we won't provide option for user to choice connection protocol, just use vdsm's configuration.

For the third question. I think you are right. In the beginning, I think vmName is more readable. But for same behavior with other command, I think uuid is better. Line 1619: Line 1620: Line 1621: if __name__ == '__main__': Line 1622: if _glusterEnabled:

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

zhshzhou＠linux.vnet.ibm.com

2:43 a.m.

Zhou Zheng Sheng has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 2: No score

(1 inline comment)

.................................................... File vdsm_cli/vdsClient.py Line 1614: protocol = "tls" if self.useSSL else "tcp" Line 1615: conn = "qemu+" + protocol + "://" + self.server + "/system" Line 1616: p = subprocess.Popen(["virsh", "-c", conn, "console", args[0]]) Line 1617: p.wait() Line 1618: return 0, '' Could you tell me where do you find the code to do the configuration as you says? In vdsmd.init.in, as far as I see, in function ovirt_store_config() around line 314 to 327, vdsm enables listen_tcp when ssl=false, but when ssl=true, it leaves listen_tcp untouched, and listen_tcp is disabled by libvirtd by default. I install vdsm in a fresh machine and it does confirm what I expect. Line 1619: Line 1620: Line 1621: if __name__ == '__main__': Line 1622: if _glusterEnabled:

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

Xu He Jie

3:30 a.m.

Xu He Jie has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 2: (1 inline comment)

.................................................... File vdsm_cli/vdsClient.py Line 1614: protocol = "tls" if self.useSSL else "tcp" Line 1615: conn = "qemu+" + protocol + "://" + self.server + "/system" Line 1616: p = subprocess.Popen(["virsh", "-c", conn, "console", args[0]]) Line 1617: p.wait() Line 1618: return 0, '' Vdsm didn't set listen_tls=1 directly. But listen_tls=1 is default value as the comment in libvirtd.conf. And in line 305, vdsm always add --listen in /etc/sysconfig/libvirtd. So it equals listen_tcp=1 and listen_tls=1. Only when ssl=false, vdsm set the listen_tcp and listen_tls in libvirtd.conf. Line 1619: Line 1620: Line 1621: if __name__ == '__main__': Line 1622: if _glusterEnabled:

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

zhshzhou＠linux.vnet.ibm.com

9 Oct 9 Oct

2:43 a.m.

Zhou Zheng Sheng has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 2: (1 inline comment)

.................................................... File vdsm_cli/vdsClient.py Line 1614: protocol = "tls" if self.useSSL else "tcp" Line 1615: conn = "qemu+" + protocol + "://" + self.server + "/system" Line 1616: p = subprocess.Popen(["virsh", "-c", conn, "console", args[0]]) Line 1617: p.wait() Line 1618: return 0, '' You are right. In my previous experiment, virsh failed to connect to libvirt using tcp. I found vdsm do not reconfigure libvirt every time it starts, I have to call '/usr/lib/systemd/systemd-vdsmd reconfigure' to get the correct behaviour as you said. Line 1619: Line 1620: Line 1621: if __name__ == '__main__': Line 1622: if _glusterEnabled:

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

zhshzhou＠linux.vnet.ibm.com

11 Oct 11 Oct

9:59 a.m.

Zhou Zheng Sheng has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 3: (1 inline comment)

Since vdsm will configure libvirtd to use the CA cert and keys in /etc/pki/vdsm, I have to use a special connection string to connect to libvirtd:

virsh -c 'qemu+tls:///system?pkipath=/etc/pki/vdsm/certs/;keyfile=/etc/pki/vdsm/keys/vdsmkey.pem'

I find this information on http://libvirt.org/remote.html#Remote_URI_parameters Line 1626: p.wait() Line 1627: return 0, '' Line 1628: Line 1629: if __name__ == '__main__':

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment Gerrit-Change-Id: I368dbcbc2e180161f256f3fb450c344acb6a6c8a Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xu He Jie xuhj@linux.vnet.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com Gerrit-Reviewer: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Xu He Jie xuhj@linux.vnet.ibm.com Gerrit-Reviewer: Zhou Zheng Sheng zhshzhou@linux.vnet.ibm.com

Xu He Jie

11:40 a.m.

Xu He Jie has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 3: (1 inline comment)

.................................................... File vdsm_cli/vdsClient.py Line 1621: if len(response['vmList']) == 0: Line 1622: return -1, 'Can not find vm '%s'' % args[0] Line 1623: Line 1624: vmName = response['vmList'][0]['vmName'] Line 1625: p = subprocess.Popen(["virsh", "-c", conn, "console", vmName]) I think you need configure your ca and keys. When you install vdsm all in one, after you register your host to engine. vdsm will create link /etc/pki/CA/cacert.pem to vdsm's cacert.pem. And virsh will find cacert in /etc/pki/CA/cacert.pem in default. So if you run vdsClient in different machine, I think you need configure your ca and keys. Line 1626: p.wait() Line 1627: return 0, '' Line 1628: Line 1629: if __name__ == '__main__':

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

Jenkins CI RO

23 Nov 23 Nov

9:32 a.m.

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 4:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/155/ (2/2)

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment Gerrit-Change-Id: I368dbcbc2e180161f256f3fb450c344acb6a6c8a Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xu He Jie xuhj@linux.vnet.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com Gerrit-Reviewer: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Xu He Jie xuhj@linux.vnet.ibm.com Gerrit-Reviewer: Zhou Zheng Sheng zhshzhou@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server

Jenkins CI RO

9:32 a.m.

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 4:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/121/ (1/2)

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

Jenkins CI RO

9:33 a.m.

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 4:

Build Successful

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/121/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_manual_gerrit/155/ : SUCCESS

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

zhshzhou＠linux.vnet.ibm.com

9:37 a.m.

Zhou Zheng Sheng has posted comments on this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 4: Verified

If the host is registered to Engine, the ssl cert and key for virsh will be generated as symbol links to vdsm cert and key.

Sometimes we want to test vdsm without Engine, so the new patch set generates the symbol links if they are not there.

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

Xu He Jie

21 Feb 21 Feb

7:43 a.m.

Xu He Jie has abandoned this change.

Change subject: Add simple text-based console in vdsClient ......................................................................

Patch Set 4: Abandoned

-- To view, visit http://gerrit.ovirt.org/8041 To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: abandon Gerrit-Change-Id: I368dbcbc2e180161f256f3fb450c344acb6a6c8a Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Xu He Jie xuhj@linux.vnet.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Mark Wu wudxw@linux.vnet.ibm.com Gerrit-Reviewer: Ryan Harper ryanh@us.ibm.com Gerrit-Reviewer: ShaoHe Feng shaohef@linux.vnet.ibm.com Gerrit-Reviewer: Xu He Jie xuhj@linux.vnet.ibm.com Gerrit-Reviewer: Zhou Zheng Sheng zhshzhou@linux.vnet.ibm.com Gerrit-Reviewer: oVirt Jenkins CI Server

4145

Age (days ago)

4300

Last active (days ago)

vdsm-patches@lists.fedorahosted.org

16 comments

5 participants

tags (0)

participants (5)

Jenkins CI RO
Ryan Harper
shaohef＠linux.vnet.ibm.com
Xu He Jie
zhshzhou＠linux.vnet.ibm.com