Keep v2

Author: majst01

examples/python/ip-list.py

@@ -36,7 +36,7 @@ def main():
 
     print()
     print("ips with driver")
-    with driver.api().ip() as client:
+    with driver.apiv2().ip() as client:
         try:
             response = client.List(
                 request=ip_pb2.IPServiceListRequest(project=project),
@@ -48,7 +48,7 @@ def main():
 
     print()
     print("networks with admin driver")
-    with driver.admin().network() as client:
+    with driver.adminv2().network() as client:
         try:
             response = client.List(
                 request=network_pb2.NetworkServiceListRequest(),

generate/python_client.tpl

@@ -15,12 +15,12 @@ class Driver:
         self.token = token
         self.timeout = timeout
 {{ range $name, $api := . }}
-    def {{ $name | trimSuffix "v2" | lower }}(self):
-        return {{ $name | trimSuffix "v2" | title }}Driver(baseurl=self.baseurl, token=self.token, timeout=self.timeout)
+    def {{ $name | lower }}(self):
+        return {{ $name | title }}(baseurl=self.baseurl, token=self.token, timeout=self.timeout)
 {{ end }}
 
 {{ range $name, $api := . -}}
-class {{ $name | trimSuffix "v2" | title }}Driver:
+class {{ $name | title }}:
     def __init__(self, baseurl: str, token: str, timeout: int = 10):
         self.baseurl = baseurl
         self.token = token

python/metalstack/client/client.py

@@ -36,17 +36,17 @@ def __init__(self, baseurl: str, token: str, timeout: int = 10):
         self.token = token
         self.timeout = timeout
 
-    def admin(self):
-        return AdminDriver(baseurl=self.baseurl, token=self.token, timeout=self.timeout)
+    def adminv2(self):
+        return Adminv2(baseurl=self.baseurl, token=self.token, timeout=self.timeout)
 
-    def api(self):
-        return ApiDriver(baseurl=self.baseurl, token=self.token, timeout=self.timeout)
+    def apiv2(self):
+        return Apiv2(baseurl=self.baseurl, token=self.token, timeout=self.timeout)
 
-    def infra(self):
-        return InfraDriver(baseurl=self.baseurl, token=self.token, timeout=self.timeout)
+    def infrav2(self):
+        return Infrav2(baseurl=self.baseurl, token=self.token, timeout=self.timeout)
 
 
-class AdminDriver:
+class Adminv2:
     def __init__(self, baseurl: str, token: str, timeout: int = 10):
         self.baseurl = baseurl
         self.token = token
@@ -93,7 +93,7 @@ def token(self):
         with admin_token_connecpy.TokenServiceClient(self.baseurl, timeout=self.timeout) as client:
            yield ClientWrapper(client, self.token)
 
-class ApiDriver:
+class Apiv2:
     def __init__(self, baseurl: str, token: str, timeout: int = 10):
         self.baseurl = baseurl
         self.token = token
@@ -165,7 +165,7 @@ def version(self):
         with api_version_connecpy.VersionServiceClient(self.baseurl, timeout=self.timeout) as client:
            yield ClientWrapper(client, self.token)
 
-class InfraDriver:
+class Infrav2:
     def __init__(self, baseurl: str, token: str, timeout: int = 10):
         self.baseurl = baseurl
         self.token = token