Added os list

README.md

@@ -1,8 +1,30 @@
 twvdscli
 ====
 
-Это утилита для управления серверами и сервисами в Timeweb Cloud. 
+Эта утилита предназначена для управления серверами и сервисами в Timeweb Cloud. 
-На данный момент можно запускать, останавливать, клонировать и удалять сервера, а также создавать бекапы для основного диска.
+
+Функциональность:
+
+## VDS
+* Создание
+* Удаление
+* Клонирование
+* Получение списка
+* Получение информации по конкретной VDS
+### Снапшоты
+* Создание
+* Откат
+* Удаление
+### Бекапы 
+* Создание
+* Вывод списка
+* Удаление
+  P.S.: Больше возможностей нет из-за ограниченности API
+## DBaaS
+* Создание
+* Вывод списка
+* Подключение через CLI
+
 
 # Установка
 
@@ -15,3 +37,4 @@ pip3 install --user -r requirements.txt
 # Запуск
 
 При первом запуске утилита спросит логин и пароль, после чего запишет их в ~/.config/twvdscli.ini в формате base64 через знак ":".
+Утилиту можно поместить куда-нибудь в ~/.local/bin и поправить $PATH

twvdscli.py

@@ -16,24 +16,32 @@ from time import sleep
 
 
 app = typer.Typer()
-
+# twvdscli dbs
 dbs_app = typer.Typer()
 app.add_typer(dbs_app, name='dbs', help='Control Managed databases')
 
+# twvdscli vds
 servers_app = typer.Typer()
 app.add_typer(servers_app, name='vds', help='Control VDS Servers, their snapshots and backups')
 
+# twvdscli vds backups
 backups_app = typer.Typer()
 servers_app.add_typer(backups_app, name='backup', help='Create/Delete backup')
 
+# twvdscli vds snap
 snapshot_app = typer.Typer()
 servers_app.add_typer(snapshot_app, name='snap', help='Create/Rollback/Delete snapshot')
 
+# twvdscli vds info
+vds_info_app = typer.Typer()
+servers_app.add_typer(vds_info_app, name='info', help='Get info about plans and os\'es')
+
 
 class Dbaas:
     """
     DataBases As A Service
     """
+    @staticmethod
     def list():
         url = 'https://public-api.timeweb.com/api/v1/dbs'
         result = requests.get(
@@ -44,6 +52,7 @@ class Dbaas:
             return None
         return result.json()
 
+    @staticmethod
     def get(db_id):
         url = 'https://public-api.timeweb.com/api/v1/dbs/{db_id}'
         result = requests.get(
@@ -54,6 +63,24 @@ class Dbaas:
             return None
         return result.json()
 
+    @staticmethod
+    def create(passwd, name, db_type):
+        url = 'https://public-api.timeweb.com/api/v1/dbs'
+        if db_type == 'postgres':
+            service_type = 357
+        else:
+            service_type = 341
+        data = dict(host="%", login="user", password=passwd, name=name, type=db_type,
+                    hash_type="caching_sha2", service_type=service_type)
+        result = requests.post(
+            url=url,
+            json=data,
+            headers=reqHeader
+        )
+        if not result.ok:
+            return None
+        return result.json()
+
 
 class Server:
     """
@@ -382,13 +409,42 @@ def get_balance():
         print(x)
 
 
-@dbs_app.command("list")
+@dbs_app.command("create")
-def list_dbs():
+def dbs_create(passwd: str = typer.Option(..., help="DB password"),
+               name: str = typer.Option(..., help="DB Name"),
+               db_type: str = typer.Option(..., help="mysql5/mysql/postgres"),
+               raw: bool = typer.Option(False, help="Get result as raw json")):
     """
-    Show list of DBs
+    Create database
+    """
+    # service_type == 341 - mysql
+    # service_type == 357 - pgsql
+    result = Dbaas.create(passwd=passwd, name=name, db_type=db_type)
+    if raw:
+        print(result)
+        return
+    # We need to get id from result['db']['id']
+    db_id = result['db']['id']
+    for frame in cycle(r'-\|/'):
+        state = Dbaas.get(db_id)
+        if state:
+            if state['db']['status'] == 'started':
+                print(typer.style("\nCreated DB: " + name, fg=typer.colors.GREEN))
+                break
+        print('\r', frame, sep='', end='', flush=True)
+        sleep(0.1)
+
+
+@dbs_app.command("list")
+def dbs_list(raw: bool = typer.Option(False, help="Get result as raw json")):
+    """
+    Show list of DBs:
     ID, State, Name, IP, local IP, Password, Type
     """
     list_of_dbaas = Dbaas.list()
+    if raw:
+        print(list_of_dbaas)
+        return
     x = PrettyTable()
     x.field_names = ['id', 'state', 'name', 'ip', 'local_ip', 'password', 'type']
     if list_of_dbaas is None:
@@ -421,6 +477,165 @@ def list_dbs():
     print(x)
 
 
+@dbs_app.command("goto")
+def dbs_connect(db_id: Optional[int] = typer.Argument(None)):
+    """
+    Connect to DB CLI
+    """
+    cmd_mysql = "mysql -u {login} -p{password} -h {ip} -P 3306 -D default_db"
+    cmd_psql = "psql -d default_db -U  {login} -W -p 5432 -h {ip}"
+    # Get DB ID if not specified
+    if db_id is None:
+        dbs_list()
+        db_id = input("Enter DB ID: ")
+    # Get type of DB, password, IP
+    db_data = Dbaas.get(db_id)
+
+    db_type = db_data['db']['type']
+    db_pass = db_data['db']['password']
+    db_ip = db_data['db']['ip']
+    db_user = db_data['db']['login']
+    if db_type == 'mysql' or db_type == 'mysql5':
+        os.system(cmd_mysql.format(ip=db_ip, password=db_pass, login=db_user))
+    elif db_type == 'postgres':
+        print("Password: ", db_pass)
+        os.system(cmd_psql.format(ip=db_ip, login=db_user))
+
+
+@vds_info_app.command("plans")
+def vds_plans(raw: bool = typer.Option(False, help="Get result as raw json"),
+              sort_by: str = typer.Option(None, help="sort results by value/cpu/ram/disk")):
+    uri = "https://public-api.timeweb.com/api/v1/presets"
+    result = requests.get(uri, headers=reqHeader)
+
+    if not result.ok:
+        print('Error')
+        sys.exit(1)
+    # If raw - print raw result and exit
+    if raw:
+        print(result.text)
+        sys.exit(0)
+
+    # else print pretty
+    x = PrettyTable()
+    x.field_names = ['id', 'cpus', 'ram', 'disk', 'value', 'name', 'description']
+    result = result.json()
+    print("Total: "+ str(result['meta']['total']))
+    # result = result
+    for i in result['presets']:
+        x.add_row([
+            i['id'],
+            i['cpu'],
+            i['ram'],
+            i['drive'],
+            i['discount_value'],
+            i['name'],
+            i['description']
+        ])
+        if sort_by in ('cpus', 'ram', 'disk', 'value'):
+            x.sortby = sort_by
+        elif not sort_by is None:
+            print("No such sort")
+    print(x)
+
+
+@vds_info_app.command("os")
+def vds_oses(raw: bool = typer.Option(False, help="Get result as raw json")):
+    uri = "https://public-api.timeweb.com/api/v1/os"
+    result = requests.get(uri, headers=reqHeader)
+
+    if not result.ok:
+        print('Error')
+        sys.exit(1)
+    # If raw - print raw result and exit
+    if raw:
+        print(result.text)
+        sys.exit(0)
+
+    # else print pretty
+    x = PrettyTable()
+    x.field_names = ['id', 'fullname', 'family', 'name', 'latin', 'available']
+    result = result.json()
+    print("Total: "+ str(result['meta']['total']))
+    # result = result
+    for i in result['os']:
+        x.add_row([
+            i['id'],
+            i['os_caption'],
+            i['os_type'],
+            i['os_name'],
+            i['os_latin'],
+            i['is_public']
+        ])
+    print(x)
+
+
+@servers_app.command("create")
+def vds_create(
+        name: str = typer.Option(..., help="VDS Name"),
+        os_id: int = typer.Option(..., help="OS ID"),
+        preset: int = typer.Option(17, help="Preset ID"),
+        comment: str = typer.Option("", help="Comment")
+):
+    # get user group
+    group_uri = "https://public-api.timeweb.com/api/v1/accounts/{user}/group"
+    # get username from saved base64
+    config = configparser.ConfigParser()
+    config.read(os.path.join(os.getenv('HOME'), '.config', 'twvdscli.ini'))
+    based = config.get('api', 'key', fallback=None)
+    based = base64.b64decode(based)
+    based = str(based, 'utf-8')
+    user = based.split(':')[0]
+
+    group_id = requests.get(
+        group_uri.format(user=user), headers=reqHeader
+    )
+    # finally get group id
+    if group_id.ok:
+        group_id = group_id.json()['groups'][0]['id']
+
+    data = {
+      "server": {
+        "configuration": {
+          "caption": name,
+          # "disk_size": 5, # dont give a fuck
+          # "network_bandwidth": 100, # dont give a fuck
+          "os": os_id, # 47 - ubuntu 18.04
+          # "xen_cpu": 2, # dont give a fuck
+          # "xen_ram": 4096, # dont give a fuck
+          "ddos_guard": False
+        },
+        "comment": comment,
+        "group_id": group_id, # https://public-api.timeweb.com/api/v1/accounts/{user}/group
+        "name": "string", # what is this for?
+        "preset_id": preset, # you can not create vds without this, but how to create flexible vds? (preset example: 20)
+        "install_ssh_key": "",
+        "server_id": None,
+        "local_networks": []
+        }
+    }
+
+    response = requests.post(
+        "https://public-api.timeweb.com/api/v1/vds",
+        headers=reqHeader,
+        json=data
+    )
+
+    if not response.ok:
+        print(typer.style("Error", fg=typer.colors.RED))
+        sys.exit(1)
+    else:
+        response = response.json()
+    for frame in cycle(r'-\|/'):
+        state = Server.get_vds(response['server']['id'])
+        if state:
+            if state['server']['status'] == 'on':
+                print(typer.style("\nCreated: " + response['server']['configuration']['caption'], fg=typer.colors.GREEN))
+                break
+        print('\r', frame, sep='', end='', flush=True)
+        sleep(0.1)
+
+
 @servers_app.command("goto")
 def vds_goto(vds_id: Optional[int] = typer.Argument(None),
              port: int = typer.Option(22, help="Specify non standart SSH port.")):
@@ -438,18 +653,27 @@ def vds_goto(vds_id: Optional[int] = typer.Argument(None),
 
 
 @servers_app.command("start")
-def vds_start(vds_id: Optional[int] = typer.Argument(None)):
+def vds_start(vds_id: Optional[int] = typer.Argument(None), raw: bool = typer.Option(False, help="Get result as raw json")):
     """
     Start VDS
     """
     if vds_id is None:
+        if raw:
+            print(
+                dict(
+                    error="No VDS ID provided"
+                )
+            )
+            return 1
         vds_list()
         vds_id = input("Enter VDS ID: ")
     result = Server.start(vds_id)
     if result is None:
         print(typer.style("Error", fg=typer.colors.RED))
         sys.exit(1)
-
+    if raw:
+        print(result)
+        return
     for frame in cycle(r'-\|/'):
         state = Server.get_vds(vds_id)
         if state:
@@ -461,18 +685,26 @@ def vds_start(vds_id: Optional[int] = typer.Argument(None)):
 
 
 @servers_app.command("stop")
-def vds_stop(vds_id: Optional[int] = typer.Argument(None)):
+def vds_stop(vds_id: Optional[int] = typer.Argument(None), raw: bool = typer.Option(False, help="Get result as raw json")):
     """
     Stop VDS
     """
     if vds_id is None:
+        if raw:
+            print(
+                dict(
+                    error="No VDS ID provided"
+                )
+            )
+            return 1
         vds_list()
         vds_id = input("Enter VDS ID: ")
     result = Server.stop(vds_id)
     if result is None:
         print(typer.style("Error", fg=typer.colors.RED))
         sys.exit(1)
-
+    if raw:
+        print(result)
     for frame in cycle(r'-\|/'):
         state = Server.get_vds(vds_id)
         if state:
@@ -484,11 +716,19 @@ def vds_stop(vds_id: Optional[int] = typer.Argument(None)):
 
 
 @servers_app.command("clone")
-def vds_clone(vds_id: Optional[int] = typer.Argument(None)):
+def vds_clone(vds_id: Optional[int] = typer.Argument(None),
+              raw: bool = typer.Option(False, help="Get result as raw json")):
     """
     Clone VDS
     """
     if vds_id is None:
+        if raw:
+            print(
+                dict(
+                    error="No VDS ID provided"
+                )
+            )
+            sys.exit(1)
         vds_list()
         vds_id = input("Enter VDS ID: ")
     new_vds = Server.clone(vds_id)
@@ -496,6 +736,9 @@ def vds_clone(vds_id: Optional[int] = typer.Argument(None)):
         print(typer.style("Error", fg=typer.colors.RED))
         sys.exit(1)
     else:
+        if raw:
+            print(new_vds)
+            return
         new_vds = new_vds['server']
 
     for frame in cycle(r'-\|/'):
@@ -509,17 +752,29 @@ def vds_clone(vds_id: Optional[int] = typer.Argument(None)):
 
 
 @servers_app.command("remove")
-def vds_remove(vds_id: Optional[int] = typer.Argument(None)):
+def vds_remove(vds_id: Optional[int] = typer.Argument(None),
+               raw: bool = typer.Option(False, help="Get result as raw json")):
     """
     Remove VDS
     """
     if vds_id is None:
+        if raw:
+            print(
+                dict(
+                    error="No VDS ID provided"
+                )
+            )
+            sys.exit(1)
         vds_list()
         vds_id = input("Enter VDS ID: ")
     result = Server.remove(vds_id)
     if result is None:
         print(typer.style("Error", fg=typer.colors.RED))
         sys.exit(1)
+    else:
+        if raw:
+            print(result)
+            sys.exit(0)
     for frame in cycle(r'-\|/'):
         state = Server.get_vds(vds_id)
         if not state.get('server'):
@@ -568,7 +823,6 @@ def auth(based):
 
     result = requests.post(
         'https://public-api.timeweb.com/api/v2/auth',
-        json=dict(refresh_token="string"),
         headers=headers
     )
     if not result.ok: