From 9f4d8d2ebe39414a1c8d0e36e0fa9134df8792b1 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Sat, 12 Nov 2022 22:48:50 +0100
Subject: [PATCH] Simplify+validate examples

---
 README.md                        | 14 +++++---------
 example/configure_single_node.py | 14 +++++---------
 example/short.py                 | 14 +++++---------
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index d679a47..9b51f5f 100644
--- a/README.md
+++ b/README.md
@@ -17,12 +17,8 @@ Now, let imagine you have a fresh Garage instance running on localhost, with the
 
 ```python
 import garage_admin_sdk
-from garage_admin_sdk.api import nodes_api, layout_api, key_api
-from garage_admin_sdk.model.node_cluster_info import NodeClusterInfo
-from garage_admin_sdk.model.layout_version import LayoutVersion
-from garage_admin_sdk.model.add_key_request import AddKeyRequest
-from garage_admin_sdk.model.update_key_request import UpdateKeyRequest
-from garage_admin_sdk.model.update_key_request_allow import UpdateKeyRequestAllow
+from garage_admin_sdk.apis import *
+from garage_admin_sdk.models import *
 
 configuration = garage_admin_sdk.Configuration(
   host = "http://localhost:3903/v0",
@@ -31,9 +27,9 @@ configuration = garage_admin_sdk.Configuration(
 
 # Init APIs
 api = garage_admin_sdk.ApiClient(configuration)
-nodes = nodes_api.NodesApi(api)
-layout = layout_api.LayoutApi(api)
-keys = key_api.KeyApi(api)
+nodes = NodesApi(api)
+layout = LayoutApi(api)
+keys = KeyApi(api)
 
 # Display some info on the node
 status = nodes.get_nodes()
diff --git a/example/configure_single_node.py b/example/configure_single_node.py
index c287b6d..f9bb0d3 100644
--- a/example/configure_single_node.py
+++ b/example/configure_single_node.py
@@ -1,10 +1,6 @@
 import garage_admin_sdk
-from garage_admin_sdk.api import nodes_api, layout_api, key_api
-from garage_admin_sdk.model.node_cluster_info import NodeClusterInfo
-from garage_admin_sdk.model.layout_version import LayoutVersion
-from garage_admin_sdk.model.add_key_request import AddKeyRequest
-from garage_admin_sdk.model.update_key_request import UpdateKeyRequest
-from garage_admin_sdk.model.update_key_request_allow import UpdateKeyRequestAllow
+from garage_admin_sdk.apis import *
+from garage_admin_sdk.models import *
 
 configuration = garage_admin_sdk.Configuration(
     host = "http://localhost:3903/v0",
@@ -13,12 +9,12 @@ configuration = garage_admin_sdk.Configuration(
 
 with garage_admin_sdk.ApiClient(configuration) as api_client:
     # --- NODE INFO ---
-    nodes = nodes_api.NodesApi(api_client)
+    nodes = NodesApi(api_client)
     status = nodes.get_nodes()
     print(f"running garage {status.garage_version}, node_id {status.node}")
 
     # --- LAYOUT ---
-    layout = layout_api.LayoutApi(api_client)
+    layout = LayoutApi(api_client)
 
     current = layout.get_layout()
     dirty_node = len(current.roles) != 0 or \
@@ -52,7 +48,7 @@ with garage_admin_sdk.ApiClient(configuration) as api_client:
 
 
     # --- CREATE KEY ---
-    keys = key_api.KeyApi(api_client)
+    keys = KeyApi(api_client)
     kreq = AddKeyRequest(name="openapi")
     kinfo = keys.add_key(kreq)
     print(f"key {kinfo.name} added.")
diff --git a/example/short.py b/example/short.py
index b638825..480246d 100644
--- a/example/short.py
+++ b/example/short.py
@@ -1,10 +1,6 @@
 import garage_admin_sdk
-from garage_admin_sdk.api import nodes_api, layout_api, key_api
-from garage_admin_sdk.model.node_cluster_info import NodeClusterInfo
-from garage_admin_sdk.model.layout_version import LayoutVersion 
-from garage_admin_sdk.model.add_key_request import AddKeyRequest
-from garage_admin_sdk.model.update_key_request import UpdateKeyRequest
-from garage_admin_sdk.model.update_key_request_allow import UpdateKeyRequestAllow
+from garage_admin_sdk.apis import *
+from garage_admin_sdk.models import *
 
 configuration = garage_admin_sdk.Configuration(
   host = "http://localhost:3903/v0",
@@ -13,9 +9,9 @@ configuration = garage_admin_sdk.Configuration(
 
 # Init APIs
 api = garage_admin_sdk.ApiClient(configuration)
-nodes = nodes_api.NodesApi(api) 
-layout = layout_api.LayoutApi(api)
-keys = key_api.KeyApi(api)
+nodes = NodesApi(api) 
+layout = LayoutApi(api)
+keys = KeyApi(api)
 
 # Display some info on the node
 status = nodes.get_nodes()