LICENSE added + fixed some imports
This commit is contained in:
		
					parent
					
						
							
								1e7300b56e
							
						
					
				
			
			
				commit
				
					
						abc2c6fe51
					
				
			
		
					 8 changed files with 684 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -1,5 +1,6 @@
 | 
			
		|||
import json
 | 
			
		||||
import os
 | 
			
		||||
 | 
			
		||||
from uuid import uuid4
 | 
			
		||||
 | 
			
		||||
from ucloud.config import etcd_client, env_vars
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,6 +4,7 @@ import random
 | 
			
		|||
import subprocess as sp
 | 
			
		||||
 | 
			
		||||
import requests
 | 
			
		||||
 | 
			
		||||
from pyotp import TOTP
 | 
			
		||||
 | 
			
		||||
from ucloud.config import vm_pool, env_vars
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -13,7 +13,7 @@ from ucloud.common.request import RequestEntry, RequestType
 | 
			
		|||
from ucloud.config import (etcd_client, request_pool, vm_pool, host_pool, env_vars, image_storage_handler)
 | 
			
		||||
from . import schemas
 | 
			
		||||
from .helper import generate_mac, mac2ipv6
 | 
			
		||||
from ucloud.api import logger
 | 
			
		||||
from . import logger
 | 
			
		||||
 | 
			
		||||
app = Flask(__name__)
 | 
			
		||||
api = Api(app)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,7 @@ import subprocess as sp
 | 
			
		|||
import time
 | 
			
		||||
from uuid import uuid4
 | 
			
		||||
 | 
			
		||||
from ucloud.filescanner import logger
 | 
			
		||||
from . import logger
 | 
			
		||||
from ucloud.config import env_vars, etcd_client
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -12,7 +12,7 @@ from ucloud.config import (vm_pool, request_pool,
 | 
			
		|||
 | 
			
		||||
from .helper import find_free_port
 | 
			
		||||
from . import virtualmachine
 | 
			
		||||
from host import logger
 | 
			
		||||
from ucloud.host import logger
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def update_heartbeat(hostname):
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -21,9 +21,11 @@ import sshtunnel
 | 
			
		|||
from ucloud.common.helpers import get_ipv6_address
 | 
			
		||||
from ucloud.common.request import RequestEntry, RequestType
 | 
			
		||||
from ucloud.common.vm import VMEntry, VMStatus
 | 
			
		||||
from ucloud.config import etcd_client, request_pool, running_vms, vm_pool, env_vars, image_storage_handler
 | 
			
		||||
from ucloud.config import (etcd_client, request_pool,
 | 
			
		||||
                           running_vms, vm_pool, env_vars,
 | 
			
		||||
                           image_storage_handler)
 | 
			
		||||
from . import qmp
 | 
			
		||||
from host import logger
 | 
			
		||||
from ucloud.host import logger
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class VM:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,7 +9,7 @@ from ucloud.config import etcd_client
 | 
			
		|||
from ucloud.config import host_pool, request_pool, vm_pool, env_vars
 | 
			
		||||
from .helper import (get_suitable_host, dead_host_mitigation, dead_host_detection,
 | 
			
		||||
                     assign_host, NoSuitableHostFound)
 | 
			
		||||
from ucloud.scheduler import logger
 | 
			
		||||
from . import logger
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def main():
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue