Skip to content

[blocker] CLOUDSTACK-9452: use optparse instead of argparse in patchviasocket #1633

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

Closed
yadvr wants to merge 1 commit into from
Closed

[blocker] CLOUDSTACK-9452: use optparse instead of argparse in patchviasocket #1633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions scripts/vm/hypervisor/kvm/patchviasocket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@
# reads it from /dev/vport0p1 in cloud_early_config
#

import argparse
import os
import socket

from optparse import OptionParser

SOCK_FILE = "/var/lib/libvirt/qemu/{name}.agent"
PUB_KEY_FILE = "/root/.ssh/id_rsa.pub.cloud"
MESSAGE = "pubkey:{key}\ncmdline:{cmdline}\n"
Expand Down Expand Up @@ -65,12 +66,15 @@ def send_to_socket(sock_file, key_file, cmdline):


if __name__ == "__main__":
parser = argparse.ArgumentParser(description="Send configuration to system VM socket")
parser.add_argument("-n", "--name", required=True, help="Name of VM")
parser.add_argument("-p", "--cmdline", required=True, help="Command line")
parser = OptionParser(usage="Send configuration to system VM socket")
parser.add_option("-n", "--name", action="store", dest="name", help="Name of the VM")
parser.add_option("-p", "--cmdline", action="store", dest="cmdline", help="Command line")

(options, args) = parser.parse_args()

arguments = parser.parse_args()
if not options.name or not options.cmdline:
parser.error("VM name and cmdline are required options you need to pass")

socket_file = SOCK_FILE.format(name=arguments.name)
socket_file = SOCK_FILE.format(name=options.name)

exit(send_to_socket(socket_file, PUB_KEY_FILE, arguments.cmdline))
exit(send_to_socket(socket_file, PUB_KEY_FILE, options.cmdline))