rpyc-pve-cloud 0.0.42__tar.gz → 0.1.1__tar.gz

{rpyc_pve_cloud-0.0.42/src/rpyc_pve_cloud.egg-info → rpyc_pve_cloud-0.1.1}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: rpyc-pve-cloud
-Version: 0.0.42
+Version: 0.1.1
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE.md
-Requires-Dist: py-pve-cloud<0.14.0,>=0.13.23
+Requires-Dist: py-pve-cloud<0.15.0,>=0.14.1
 Requires-Dist: grpcio==1.76.0
 Requires-Dist: asyncssh==2.21.0
 Requires-Dist: protobuf==6.33.2

{rpyc_pve_cloud-0.0.42 → rpyc_pve_cloud-0.1.1}/requirements.txt

@@ -1,5 +1,5 @@
 # pessimistic operator for local tdd installs (pip install -e .)
-py-pve-cloud>=0.13.23,<0.14.0
+py-pve-cloud>=0.14.1,<0.15.0
 grpcio==1.76.0
 asyncssh==2.21.0
 protobuf==6.33.2

rpyc_pve_cloud-0.1.1/src/pve_cloud_rpc/_version.py

@@ -0,0 +1 @@
+__version__ = "0.1.1"

{rpyc_pve_cloud-0.0.42 → rpyc_pve_cloud-0.1.1}/src/pve_cloud_rpc/server.py

@@ -1,14 +1,17 @@
-import asyncio, asyncssh
+import asyncio
+import socket
+import sys
+
+import asyncssh
 import grpc
+import yaml
+from pve_cloud.cli.pvclu import get_cluster_vars, get_ssh_master_kubeconfig
+from pve_cloud.lib.inventory import *
+
 import pve_cloud_rpc.protos.cloud_pb2 as cloud_pb2
 import pve_cloud_rpc.protos.cloud_pb2_grpc as cloud_pb2_grpc
 import pve_cloud_rpc.protos.health_pb2 as health_pb2
 import pve_cloud_rpc.protos.health_pb2_grpc as health_pb2_grpc
-from pve_cloud.lib.inventory import *
-from pve_cloud.cli.pvclu import get_cluster_vars, get_ssh_master_kubeconfig
-import yaml
-import socket
-import sys
 
 
 class HealthServicer(health_pb2_grpc.HealthServicer):
@@ -18,14 +21,21 @@ class HealthServicer(health_pb2_grpc.HealthServicer):
     async def Check(self, request, context):
         target_pve = request.target_pve
         try:
-            get_online_pve_host(target_pve, skip_py_cloud_check=False) # actually perform the check
-            return health_pb2.HealthCheckResponse(status=health_pb2.HealthCheckResponse.SERVING)
+            get_online_pve_host(
+                target_pve, skip_py_cloud_check=False
+            )  # actually perform the check
+            return health_pb2.HealthCheckResponse(
+                status=health_pb2.HealthCheckResponse.SERVING
+            )
         except RuntimeError as e:
-            return health_pb2.HealthCheckResponse(status=health_pb2.HealthCheckResponse.MISSMATCH, error_message=f"py-pve-cloud version check failed with: {e}") # go provider process will kill
+            return health_pb2.HealthCheckResponse(
+                status=health_pb2.HealthCheckResponse.MISSMATCH,
+                error_message=f"py-pve-cloud version check failed with: {e}",
+            )  # go provider process will kill
 
 
 class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
-    
+
     async def GetMasterKubeconfig(self, request, context):
         target_pve = request.target_pve
         stack_name = request.stack_name
@@ -33,8 +43,9 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
         online_pve_host = get_online_pve_host(target_pve, skip_py_cloud_check=True)
         cluster_vars = get_cluster_vars(online_pve_host)
 
-        return cloud_pb2.GetKubeconfigResponse(config=get_ssh_master_kubeconfig(cluster_vars, stack_name))
-
+        return cloud_pb2.GetKubeconfigResponse(
+            config=get_ssh_master_kubeconfig(cluster_vars, stack_name)
+        )
 
     async def GetClusterVars(self, request, context):
         target_pve = request.target_pve
@@ -44,71 +55,83 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
 
         return cloud_pb2.GetClusterVarsResponse(vars=yaml.safe_dump(cluster_vars))
 
-
     async def GetCloudSecret(self, request, context):
         target_pve = request.target_pve
         secret_name = request.secret_name
 
         online_pve_host = get_online_pve_host(target_pve, skip_py_cloud_check=True)
-        async with asyncssh.connect(online_pve_host, username='root', known_hosts=None) as conn:
-            cmd = await conn.run(f"cat /etc/pve/cloud/secrets/{secret_name}", check=True)
+        async with asyncssh.connect(
+            online_pve_host, username="root", known_hosts=None
+        ) as conn:
+            cmd = await conn.run(
+                f"cat /etc/pve/cloud/secrets/{secret_name}", check=True
+            )
             catted_secret = cmd.stdout
-            
+
         return cloud_pb2.GetCloudSecretResponse(secret=catted_secret)
-    
 
     async def GetCephAccess(self, request, context):
         target_pve = request.target_pve
 
         online_pve_host = get_online_pve_host(target_pve, skip_py_cloud_check=True)
-        async with asyncssh.connect(online_pve_host, username='root', known_hosts=None) as conn:
+        async with asyncssh.connect(
+            online_pve_host, username="root", known_hosts=None
+        ) as conn:
             cmd = await conn.run(f"cat /etc/ceph/ceph.conf", check=True)
             catted_conf = cmd.stdout
 
-            cmd = await conn.run(f"cat /etc/pve/priv/ceph.client.admin.keyring", check=True)
-            catted_keyring = cmd.stdout   
-
-
-        return cloud_pb2.GetCephAccessResponse(ceph_conf=catted_conf, admin_keyring=catted_keyring)
+            cmd = await conn.run(
+                f"cat /etc/pve/priv/ceph.client.admin.keyring", check=True
+            )
+            catted_keyring = cmd.stdout
 
+        return cloud_pb2.GetCephAccessResponse(
+            ceph_conf=catted_conf, admin_keyring=catted_keyring
+        )
 
     async def GetSshKey(self, request, context):
         target_pve = request.target_pve
 
         online_pve_host = get_online_pve_host(target_pve, skip_py_cloud_check=True)
-        async with asyncssh.connect(online_pve_host, username='root', known_hosts=None) as conn:
+        async with asyncssh.connect(
+            online_pve_host, username="root", known_hosts=None
+        ) as conn:
             match request.key_type:
                 case cloud_pb2.GetSshKeyRequest.PVE_HOST_RSA:
                     cmd = await conn.run(f"cat /root/.ssh/id_rsa", check=True)
-                    catted_key = cmd.stdout   
+                    catted_key = cmd.stdout
                 case cloud_pb2.GetSshKeyRequest.AUTOMATION:
-                    cmd = await conn.run(f"cat /etc/pve/cloud/automation_id_ed25519", check=True)
-                    catted_key = cmd.stdout  
+                    cmd = await conn.run(
+                        f"cat /etc/pve/cloud/automation_id_ed25519", check=True
+                    )
+                    catted_key = cmd.stdout
 
         return cloud_pb2.GetSshKeyResponse(key=catted_key)
-    
 
     async def GetProxmoxApi(self, request, context):
         target_pve = request.target_pve
 
         online_pve_host = get_online_pve_host(target_pve, skip_py_cloud_check=True)
-        async with asyncssh.connect(online_pve_host, username='root', known_hosts=None) as conn:
+        async with asyncssh.connect(
+            online_pve_host, username="root", known_hosts=None
+        ) as conn:
             args_string = None
             if request.get_args:
                 args_string = " ".join(f"{k} {v}" for k, v in request.get_args.items())
-            
-            cmd = await conn.run(f"pvesh get {request.api_path} {args_string} --output-format json", check=True)
-            resp_json = cmd.stdout   
+
+            cmd = await conn.run(
+                f"pvesh get {request.api_path} {args_string} --output-format json",
+                check=True,
+            )
+            resp_json = cmd.stdout
 
         return cloud_pb2.GetProxmoxApiResponse(json_resp=resp_json)
-    
 
     async def GetProxmoxHost(self, request, context):
         target_pve = request.target_pve
         online_pve_host = get_online_pve_host(target_pve, skip_py_cloud_check=True)
 
         return cloud_pb2.GetProxmoxHostResponse(pve_host=online_pve_host)
-    
 
     async def GetPveInventory(self, request, context):
         target_pve = request.target_pve
@@ -116,7 +139,9 @@ class CloudServiceServicer(cloud_pb2_grpc.CloudServiceServicer):
         cloud_domain = get_cloud_domain(target_pve)
         pve_inventory = get_pve_inventory(cloud_domain, skip_py_cloud_check=True)
 
-        return cloud_pb2.GetPveInventoryResponse(inventory=yaml.safe_dump(pve_inventory), cloud_domain=cloud_domain)
+        return cloud_pb2.GetPveInventoryResponse(
+            inventory=yaml.safe_dump(pve_inventory), cloud_domain=cloud_domain
+        )
 
 
 def is_port_bound(port, host="0.0.0.0"):
@@ -126,8 +151,8 @@ def is_port_bound(port, host="0.0.0.0"):
             s.bind((host, port))
             return False  # not bound
         except OSError:
-            return True   # bound
-        
+            return True  # bound
+
 
 async def serve():
     server = grpc.aio.server()
@@ -135,10 +160,10 @@ async def serve():
 
     health_servicer = HealthServicer()
     health_pb2_grpc.add_HealthServicer_to_server(health_servicer, server)
-    
+
     socket_file = f"/tmp/pc-rpc-{sys.argv[1]}.sock"
 
-    server.add_insecure_port(f"unix://{socket_file}") 
+    server.add_insecure_port(f"unix://{socket_file}")
     await server.start()
 
     print(f"gRPC AsyncIO server running on {socket_file}")
@@ -155,4 +180,4 @@ async def serve():
 
 
 def main():
-    asyncio.run(serve())
+    asyncio.run(serve())

{rpyc_pve_cloud-0.0.42 → rpyc_pve_cloud-0.1.1/src/rpyc_pve_cloud.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: rpyc-pve-cloud
-Version: 0.0.42
+Version: 0.1.1
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE.md
-Requires-Dist: py-pve-cloud<0.14.0,>=0.13.23
+Requires-Dist: py-pve-cloud<0.15.0,>=0.14.1
 Requires-Dist: grpcio==1.76.0
 Requires-Dist: asyncssh==2.21.0
 Requires-Dist: protobuf==6.33.2

{rpyc_pve_cloud-0.0.42 → rpyc_pve_cloud-0.1.1}/src/rpyc_pve_cloud.egg-info/requires.txt

@@ -1,4 +1,4 @@
-py-pve-cloud<0.14.0,>=0.13.23
+py-pve-cloud<0.15.0,>=0.14.1
 grpcio==1.76.0
 asyncssh==2.21.0
 protobuf==6.33.2

rpyc_pve_cloud-0.0.42/src/pve_cloud_rpc/_version.py

@@ -1 +0,0 @@
-__version__ = "0.0.42"