Skip to content

Commit fb9944d

Browse files
majst01majst01
committed
rename methods.proto, simpler imports
1 parent c7ce8c2 commit fb9944d

File tree

10 files changed

+130
-153
lines changed

10 files changed

+130
-153
lines changed

‎doc/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1432,7 +1432,7 @@ <h2>Table of Contents</h2>
14321432

14331433

14341434
<li>
1435-
<a href="#metalstack%2fapi%2fv2%2fmethods.proto">metalstack/api/v2/methods.proto</a>
1435+
<a href="#metalstack%2fapi%2fv2%2fmethod.proto">metalstack/api/v2/method.proto</a>
14361436
<ul>
14371437

14381438
<li>
@@ -14092,7 +14092,7 @@ <h3 id="metalstack.api.v2.HealthService">HealthService</h3>
1409214092

1409314093

1409414094
<div class="file-heading">
14095-
<h2 id="metalstack/api/v2/methods.proto">metalstack/api/v2/methods.proto</h2><a href="#title">Top</a>
14095+
<h2 id="metalstack/api/v2/method.proto">metalstack/api/v2/method.proto</h2><a href="#title">Top</a>
1409614096
</div>
1409714097
<p></p>
1409814098

‎generate/python_client.tpl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ from connecpy.exceptions import ConnecpyServerException
66

77
{{ range $name, $api := . -}}
88
{{ range $svc := $api.Services -}}
9-
from metalstack.{{ $name | trimSuffix "v2" }}.v2 import {{ $svc | trimSuffix "Service" | lower }}_pb2 as {{ $name | trimSuffix "v2" }}_{{ $svc | trimSuffix "Service" | lower }}_pb2
10-
from metalstack.{{ $name | trimSuffix "v2" }}.v2 import {{ $svc | trimSuffix "Service" | lower }}_connecpy as {{ $name | trimSuffix "v2" }}_{{ $svc | trimSuffix "Service" | lower }}_connecpy
9+
import metalstack.{{ $name | trimSuffix "v2" }}.v2.{{ $svc | trimSuffix "Service" | lower }}_connecpy as {{ $name | trimSuffix "v2" }}_{{ $svc | trimSuffix "Service" | lower }}_connecpy
1110
{{ end }}
1211
{{ end }}
1312

go/metalstack/api/v2/apiv2connect/methods.connect.go renamed to go/metalstack/api/v2/apiv2connect/method.connect.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go/metalstack/api/v2/methods.pb.go renamed to go/metalstack/api/v2/method.pb.go

Lines changed: 38 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

proto/metalstack/api/v2/methods.proto renamed to proto/metalstack/api/v2/method.proto

File renamed without changes.

‎python/client/client.py‎

Lines changed: 24 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,30 @@
44
from connecpy.context import ClientContext
55
from connecpy.exceptions import ConnecpyServerException
66

7-
from metalstack.admin.v2 import filesystem_pb2 as admin_filesystem_pb2
8-
from metalstack.admin.v2 import filesystem_connecpy as admin_filesystem_connecpy
9-
from metalstack.admin.v2 import image_pb2 as admin_image_pb2
10-
from metalstack.admin.v2 import image_connecpy as admin_image_connecpy
11-
from metalstack.admin.v2 import ip_pb2 as admin_ip_pb2
12-
from metalstack.admin.v2 import ip_connecpy as admin_ip_connecpy
13-
from metalstack.admin.v2 import network_pb2 as admin_network_pb2
14-
from metalstack.admin.v2 import network_connecpy as admin_network_connecpy
15-
from metalstack.admin.v2 import partition_pb2 as admin_partition_pb2
16-
from metalstack.admin.v2 import partition_connecpy as admin_partition_connecpy
17-
from metalstack.admin.v2 import size_pb2 as admin_size_pb2
18-
from metalstack.admin.v2 import size_connecpy as admin_size_connecpy
19-
from metalstack.admin.v2 import tenant_pb2 as admin_tenant_pb2
20-
from metalstack.admin.v2 import tenant_connecpy as admin_tenant_connecpy
21-
from metalstack.admin.v2 import token_pb2 as admin_token_pb2
22-
from metalstack.admin.v2 import token_connecpy as admin_token_connecpy
23-
24-
from metalstack.api.v2 import filesystem_pb2 as api_filesystem_pb2
25-
from metalstack.api.v2 import filesystem_connecpy as api_filesystem_connecpy
26-
from metalstack.api.v2 import health_pb2 as api_health_pb2
27-
from metalstack.api.v2 import health_connecpy as api_health_connecpy
28-
from metalstack.api.v2 import image_pb2 as api_image_pb2
29-
from metalstack.api.v2 import image_connecpy as api_image_connecpy
30-
from metalstack.api.v2 import ip_pb2 as api_ip_pb2
31-
from metalstack.api.v2 import ip_connecpy as api_ip_connecpy
32-
from metalstack.api.v2 import method_pb2 as api_method_pb2
33-
from metalstack.api.v2 import method_connecpy as api_method_connecpy
34-
from metalstack.api.v2 import network_pb2 as api_network_pb2
35-
from metalstack.api.v2 import network_connecpy as api_network_connecpy
36-
from metalstack.api.v2 import partition_pb2 as api_partition_pb2
37-
from metalstack.api.v2 import partition_connecpy as api_partition_connecpy
38-
from metalstack.api.v2 import project_pb2 as api_project_pb2
39-
from metalstack.api.v2 import project_connecpy as api_project_connecpy
40-
from metalstack.api.v2 import size_pb2 as api_size_pb2
41-
from metalstack.api.v2 import size_connecpy as api_size_connecpy
42-
from metalstack.api.v2 import tenant_pb2 as api_tenant_pb2
43-
from metalstack.api.v2 import tenant_connecpy as api_tenant_connecpy
44-
from metalstack.api.v2 import token_pb2 as api_token_pb2
45-
from metalstack.api.v2 import token_connecpy as api_token_connecpy
46-
from metalstack.api.v2 import user_pb2 as api_user_pb2
47-
from metalstack.api.v2 import user_connecpy as api_user_connecpy
48-
from metalstack.api.v2 import version_pb2 as api_version_pb2
49-
from metalstack.api.v2 import version_connecpy as api_version_connecpy
50-
51-
from metalstack.infra.v2 import bmc_pb2 as infra_bmc_pb2
52-
from metalstack.infra.v2 import bmc_connecpy as infra_bmc_connecpy
7+
import metalstack.admin.v2.filesystem_connecpy as admin_filesystem_connecpy
8+
import metalstack.admin.v2.image_connecpy as admin_image_connecpy
9+
import metalstack.admin.v2.ip_connecpy as admin_ip_connecpy
10+
import metalstack.admin.v2.network_connecpy as admin_network_connecpy
11+
import metalstack.admin.v2.partition_connecpy as admin_partition_connecpy
12+
import metalstack.admin.v2.size_connecpy as admin_size_connecpy
13+
import metalstack.admin.v2.tenant_connecpy as admin_tenant_connecpy
14+
import metalstack.admin.v2.token_connecpy as admin_token_connecpy
15+
16+
import metalstack.api.v2.filesystem_connecpy as api_filesystem_connecpy
17+
import metalstack.api.v2.health_connecpy as api_health_connecpy
18+
import metalstack.api.v2.image_connecpy as api_image_connecpy
19+
import metalstack.api.v2.ip_connecpy as api_ip_connecpy
20+
import metalstack.api.v2.method_connecpy as api_method_connecpy
21+
import metalstack.api.v2.network_connecpy as api_network_connecpy
22+
import metalstack.api.v2.partition_connecpy as api_partition_connecpy
23+
import metalstack.api.v2.project_connecpy as api_project_connecpy
24+
import metalstack.api.v2.size_connecpy as api_size_connecpy
25+
import metalstack.api.v2.tenant_connecpy as api_tenant_connecpy
26+
import metalstack.api.v2.token_connecpy as api_token_connecpy
27+
import metalstack.api.v2.user_connecpy as api_user_connecpy
28+
import metalstack.api.v2.version_connecpy as api_version_connecpy
29+
30+
import metalstack.infra.v2.bmc_connecpy as infra_bmc_connecpy
5331

5432

5533

0 commit comments

Comments
 (0)