cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sverrirab <...@git.apache.org>
Subject [GitHub] cloudstack pull request: Convert patchviasocket to python (removes...
Date Fri, 06 May 2016 09:56:06 GMT
Github user sverrirab commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/1533#discussion_r62309904
  
    --- Diff: scripts/vm/hypervisor/kvm/patchviasocket.py ---
    @@ -0,0 +1,80 @@
    +#!/usr/bin/env 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
    +# KIND, either express or implied.  See the License for the
    +# specific language governing permissions and limitations
    +# under the License.
    +
    +#
    +# This script connects to the system vm socket and writes the
    +# authorized_keys and cmdline data to it. The system VM then
    +# reads it from /dev/vport0p1 in cloud_early_config
    +#
    +
    +import argparse
    +import os
    +import socket
    +
    +SOCK_FILE = "/var/lib/libvirt/qemu/{name}.agent"
    +PUB_KEY_FILE = "/root/.ssh/id_rsa.pub.cloud"
    +MESSAGE = "pubkey:{key}\ncmdline:{cmdline}\n"
    +
    +
    +def read_pub_key(key_file):
    +    try:
    +        if os.path.isfile(key_file):
    +            with open(key_file, "r") as f:
    +                return f.read()
    +    except IOError:
    +        return None
    +
    +
    +def send_to_socket(sock_file, key_file, cmdline):
    +    pub_key = read_pub_key(key_file)
    +
    +    if not pub_key:
    +        print("ERROR: ssh public key not found on host at {0}".format(key_file))
    +        return 1
    +
    +    # Keep old substitution from perl code:
    +    cmdline = cmdline.replace("%", " ")
    +
    +    msg = MESSAGE.format(key=pub_key, cmdline=cmdline)
    +
    +    if not os.path.exists(sock_file):
    +        print("ERROR: {0} socket not found".format(sock_file))
    +        return 1
    +
    +    try:
    +        s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
    +        s.connect(sock_file)
    +        s.sendall(msg)
    +        s.close()
    +    except IOError as e:
    --- End diff --
    
    IOError is the parent of socket.error so this will catch all socket related errors.
    The code as it stands returns 1 on any error and 0 on success - so there is no benefit
of adding a finally statement there that I can see.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message