Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
This commit is contained in:
Nico Schottelius 2019-12-31 11:30:02 +01:00
parent 7b6c02b3ab
commit 433a3b9817
21 changed files with 65 additions and 65 deletions

View file

@ -17,10 +17,10 @@ except:
setup( setup(
name="ucloud", name="uncloud",
version=version, version=version,
description="All ucloud server components.", description="uncloud cloud management",
url="https://code.ungleich.ch/ucloud/ucloud", url="https://code.ungleich.ch/uncloud/uncloud",
long_description=long_description, long_description=long_description,
long_description_content_type="text/markdown", long_description_content_type="text/markdown",
classifiers=[ classifiers=[

View file

@ -1,7 +1,7 @@
import os import os
from ucloud.shared import shared from uncloud.shared import shared
from ucloud.settings import settings from uncloud.settings import settings
class Optional: class Optional:

View file

@ -3,8 +3,8 @@ import os
from uuid import uuid4 from uuid import uuid4
from ucloud.shared import shared from uncloud.shared import shared
from ucloud.settings import settings from uncloud.settings import settings
data = { data = {
"is_public": True, "is_public": True,

View file

@ -7,8 +7,8 @@ import requests
from pyotp import TOTP from pyotp import TOTP
from ucloud.shared import shared from uncloud.shared import shared
from ucloud.settings import settings from uncloud.settings import settings
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View file

@ -9,11 +9,11 @@ from flask import Flask, request
from flask_restful import Resource, Api from flask_restful import Resource, Api
from werkzeug.exceptions import HTTPException from werkzeug.exceptions import HTTPException
from ucloud.common import counters from uncloud.common import counters
from ucloud.common.vm import VMStatus from uncloud.common.vm import VMStatus
from ucloud.common.request import RequestEntry, RequestType from uncloud.common.request import RequestEntry, RequestType
from ucloud.settings import settings from uncloud.settings import settings
from ucloud.shared import shared from uncloud.shared import shared
from . import schemas from . import schemas
from .helper import generate_mac, mac2ipv6 from .helper import generate_mac, mac2ipv6

View file

@ -1,6 +1,6 @@
""" """
This module contain classes thats validates and intercept/modify This module contain classes thats validates and intercept/modify
data coming from ucloud-cli (user) data coming from uncloud-cli (user)
It was primarily developed as an alternative to argument parser It was primarily developed as an alternative to argument parser
of Flask_Restful which is going to be deprecated. I also tried of Flask_Restful which is going to be deprecated. I also tried
@ -19,10 +19,10 @@ import os
import bitmath import bitmath
from ucloud.common.host import HostStatus from uncloud.common.host import HostStatus
from ucloud.common.vm import VMStatus from uncloud.common.vm import VMStatus
from ucloud.shared import shared from uncloud.shared import shared
from ucloud.settings import settings from uncloud.settings import settings
from . import helper, logger from . import helper, logger
from .common_fields import Field, VmUUIDField from .common_fields import Field, VmUUIDField
from .helper import check_otp, resolve_vm_name from .helper import check_otp, resolve_vm_name

View file

@ -7,7 +7,7 @@ from .classes import SpecificEtcdEntryBase
class HostStatus: class HostStatus:
"""Possible Statuses of ucloud host.""" """Possible Statuses of uncloud host."""
alive = "ALIVE" alive = "ALIVE"
dead = "DEAD" dead = "DEAD"

View file

@ -7,7 +7,7 @@ from abc import ABC
from . import logger from . import logger
from os.path import join as join_path from os.path import join as join_path
from ucloud.settings import settings as config from uncloud.settings import settings as config
class ImageStorageHandler(ABC): class ImageStorageHandler(ABC):

View file

@ -1,7 +1,7 @@
import os import os
from ucloud.settings import settings from uncloud.settings import settings
from ucloud.shared import shared from uncloud.shared import shared
def update_config(section, kwargs): def update_config(section, kwargs):

View file

@ -17,7 +17,7 @@
# -- Project information ----------------------------------------------------- # -- Project information -----------------------------------------------------
project = "ucloud" project = "uncloud"
copyright = "2019, ungleich" copyright = "2019, ungleich"
author = "ungleich" author = "ungleich"

View file

@ -7,8 +7,8 @@ import time
from uuid import uuid4 from uuid import uuid4
from . import logger from . import logger
from ucloud.settings import settings from uncloud.settings import settings
from ucloud.shared import shared from uncloud.shared import shared
def sha512sum(file: str): def sha512sum(file: str):

View file

@ -2,11 +2,11 @@ import argparse
import multiprocessing as mp import multiprocessing as mp
import time import time
from ucloud.common.request import RequestEntry, RequestType from uncloud.common.request import RequestEntry, RequestType
from ucloud.shared import shared from uncloud.shared import shared
from ucloud.settings import settings from uncloud.settings import settings
from ucloud.common.vm import VMStatus from uncloud.common.vm import VMStatus
from ucloud.vmm import VMM from uncloud.vmm import VMM
from os.path import join as join_path from os.path import join as join_path
from . import virtualmachine, logger from . import virtualmachine, logger
@ -48,7 +48,7 @@ def main(hostname):
heartbeat_updating_process = mp.Process(target=update_heartbeat, args=(hostname,)) heartbeat_updating_process = mp.Process(target=update_heartbeat, args=(hostname,))
heartbeat_updating_process.start() heartbeat_updating_process.start()
except Exception as e: except Exception as e:
raise Exception("ucloud-host heartbeat updating mechanism is not working") from e raise Exception("uncloud-host heartbeat updating mechanism is not working") from e
for events_iterator in [ for events_iterator in [
shared.etcd_client.get_prefix(settings["etcd"]["request_prefix"], value_in_json=True), shared.etcd_client.get_prefix(settings["etcd"]["request_prefix"], value_in_json=True),

View file

@ -11,14 +11,14 @@ import ipaddress
from string import Template from string import Template
from os.path import join as join_path from os.path import join as join_path
from ucloud.common.request import RequestEntry, RequestType from uncloud.common.request import RequestEntry, RequestType
from ucloud.common.vm import VMStatus, declare_stopped from uncloud.common.vm import VMStatus, declare_stopped
from ucloud.common.network import create_dev, delete_network_interface from uncloud.common.network import create_dev, delete_network_interface
from ucloud.common.schemas import VMSchema, NetworkSchema from uncloud.common.schemas import VMSchema, NetworkSchema
from ucloud.host import logger from uncloud.host import logger
from ucloud.shared import shared from uncloud.shared import shared
from ucloud.settings import settings from uncloud.settings import settings
from ucloud.vmm import VMM from uncloud.vmm import VMM
from marshmallow import ValidationError from marshmallow import ValidationError

View file

@ -3,9 +3,9 @@ import os
import subprocess as sp import subprocess as sp
from os.path import join as join_path from os.path import join as join_path
from ucloud.settings import settings from uncloud.settings import settings
from ucloud.shared import shared from uncloud.shared import shared
from ucloud.imagescanner import logger from uncloud.imagescanner import logger
def qemu_img_type(path): def qemu_img_type(path):

View file

@ -4,8 +4,8 @@ from flask import Flask, request
from flask_restful import Resource, Api from flask_restful import Resource, Api
from werkzeug.exceptions import HTTPException from werkzeug.exceptions import HTTPException
from ucloud.settings import settings from uncloud.settings import settings
from ucloud.shared import shared from uncloud.shared import shared
app = Flask(__name__) app = Flask(__name__)
api = Api(app) api = Api(app)

View file

@ -3,11 +3,11 @@ from functools import reduce
import bitmath import bitmath
from ucloud.common.host import HostStatus from uncloud.common.host import HostStatus
from ucloud.common.request import RequestEntry, RequestType from uncloud.common.request import RequestEntry, RequestType
from ucloud.common.vm import VMStatus from uncloud.common.vm import VMStatus
from ucloud.shared import shared from uncloud.shared import shared
from ucloud.settings import settings from uncloud.settings import settings
def accumulated_specs(vms_specs): def accumulated_specs(vms_specs):

View file

@ -4,9 +4,9 @@
# 2. Introduce a status endpoint of the scheduler - # 2. Introduce a status endpoint of the scheduler -
# maybe expose a prometheus compatible output # maybe expose a prometheus compatible output
from ucloud.common.request import RequestEntry, RequestType from uncloud.common.request import RequestEntry, RequestType
from ucloud.shared import shared from uncloud.shared import shared
from ucloud.settings import settings from uncloud.settings import settings
from .helper import ( from .helper import (
dead_host_mitigation, dead_host_mitigation,
dead_host_detection, dead_host_detection,

View file

@ -15,7 +15,7 @@ from main import (
main, main,
) )
from ucloud.config import etcd_client from uncloud.config import etcd_client
class TestFunctions(unittest.TestCase): class TestFunctions(unittest.TestCase):

View file

@ -3,7 +3,7 @@ import logging
import sys import sys
import os import os
from ucloud.common.etcd_wrapper import Etcd3Wrapper from uncloud.common.etcd_wrapper import Etcd3Wrapper
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -14,7 +14,7 @@ class CustomConfigParser(configparser.RawConfigParser):
result = super().__getitem__(key) result = super().__getitem__(key)
except KeyError as err: except KeyError as err:
raise KeyError( raise KeyError(
"Key '{}' not found in configuration. Make sure you configure ucloud.".format( "Key '{}' not found in configuration. Make sure you configure uncloud.".format(
key key
) )
) from err ) from err
@ -24,9 +24,9 @@ class CustomConfigParser(configparser.RawConfigParser):
class Settings(object): class Settings(object):
def __init__(self, config_key="/uncloud/config/"): def __init__(self, config_key="/uncloud/config/"):
conf_name = "ucloud.conf" conf_name = "uncloud.conf"
conf_dir = os.environ.get( conf_dir = os.environ.get(
"UCLOUD_CONF_DIR", os.path.expanduser("~/ucloud/") "UCLOUD_CONF_DIR", os.path.expanduser("~/uncloud/")
) )
self.config_file = os.path.join(conf_dir, conf_name) self.config_file = os.path.join(conf_dir, conf_name)
@ -109,7 +109,7 @@ class Settings(object):
self.config_parser.read_dict(config_from_etcd.value) self.config_parser.read_dict(config_from_etcd.value)
else: else:
raise KeyError( raise KeyError(
"Key '{}' not found in etcd. Please configure ucloud.".format( "Key '{}' not found in etcd. Please configure uncloud.".format(
self.config_key self.config_key
) )
) )

View file

@ -1,8 +1,8 @@
from ucloud.settings import settings from uncloud.settings import settings
from ucloud.common.vm import VmPool from uncloud.common.vm import VmPool
from ucloud.common.host import HostPool from uncloud.common.host import HostPool
from ucloud.common.request import RequestPool from uncloud.common.request import RequestPool
from ucloud.common.storage_handlers import get_storage_handler from uncloud.common.storage_handlers import get_storage_handler
class Shared: class Shared:

View file

@ -102,7 +102,7 @@ class VMM:
def __init__( def __init__(
self, self,
qemu_path="/usr/bin/qemu-system-x86_64", qemu_path="/usr/bin/qemu-system-x86_64",
vmm_backend=os.path.expanduser("~/ucloud/vmm/"), vmm_backend=os.path.expanduser("~/uncloud/vmm/"),
): ):
self.qemu_path = qemu_path self.qemu_path = qemu_path
self.vmm_backend = vmm_backend self.vmm_backend = vmm_backend