Merge branch 'dev'

[perso/Immae/Projets/Puppet.git] / python / list_servers.py

diff --git a/python/list_servers.py b/python/list_servers.py
index 9b8bc64b5362c9cbb669a47c4e0dbdab244ba105..6d22a563bfe1acacfde52224a72a6876e1717af9 100644 (file)
--- a/python/list_servers.py
+++ b/python/list_servers.py
@@ -6,7 +6,24 @@ except ImportError:
 
 client = ovh.Client()
 
+print("OVH cloud instances:")
+projects_list = client.get('/cloud/project/')
+for project_id in projects_list:
+    project = client.get('/cloud/project/{}'.format(project_id))
+    print("\t{}:".format(project["description"]))
+    instances_list = client.get('/cloud/project/{}/instance'.format(project_id))
+    for instance in instances_list:
+        print("\t\t{}: {}".format(instance["name"], instance["id"]))
+
 vps_list = client.get('/vps/')
 
+print("OVH VPS SSD servers:")
 for vps in vps_list:
-    print(vps)
+    print("\t{}".format(vps))
+
+import hetzner_helper
+
+print("Hetzner VPS servers:")
+return_code, json = hetzner_helper.call("servers")
+for server in json["servers"]:
+    print("\t{}: {}".format(server["name"], server["id"]))