Skip to content

Factor out shared 'Operation' class and helpers. #2165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tseaver merged 9 commits into from
Aug 24, 2016
Merged

Factor out shared 'Operation' class and helpers. #2165

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
431d61f
Factor out shared 'Operation' class and helpers.
tseaver Aug 22, 2016
12b42a6
Add metadata type url registrations.
tseaver Aug 23, 2016
23660b3
Move 'operation-api' document to 'core' section.
tseaver Aug 23, 2016
2a501cd
Fix copyright years.
tseaver Aug 23, 2016
dfa9ac1
Rename 'Operation.finished' -> 'poll'.
tseaver Aug 23, 2016
cf3f860
Include 'operation' as top-level module for json-docs.
tseaver Aug 23, 2016
f2fb74e
'_compute_type_url': drop support for non-protobuf classes.
tseaver Aug 23, 2016
9d73629
Separate back-end-provided 'pb_metadata' from caller-provided 'metada…
tseaver Aug 23, 2016
01ffb45
Capture call-site metadata.
tseaver Aug 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add metadata type url registrations. 
Lost in merge conflict resolution.
  • Loading branch information
@tseaver
tseaver committed Aug 23, 2016
commit 12b42a6864e311d039c03ebee23e7ffd80b78df9
8 changes: 8 additions & 0 deletions gcloud/bigtable/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
from gcloud.bigtable._generated import (
bigtable_instance_admin_pb2 as messages_v2_pb2)
from gcloud.operation import Operation
from gcloud.operation import _compute_type_url
from gcloud.operation import _register_type_url


_CLUSTER_NAME_RE = re.compile(r'^projects/(?P<project>[^/]+)/'
Expand All @@ -32,6 +34,12 @@
"""Default number of nodes to use when creating a cluster."""


_UPDATE_CLUSTER_METADATA_URL = _compute_type_url(
messages_v2_pb2.UpdateClusterMetadata)
_register_type_url(
_UPDATE_CLUSTER_METADATA_URL, messages_v2_pb2.UpdateClusterMetadata)


def _prepare_create_request(cluster):
"""Creates a protobuf request for a CreateCluster request.

Expand Down
10 changes: 9 additions & 1 deletion gcloud/bigtable/instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import re

from gcloud.operation import Operation
from gcloud.bigtable._generated import (
instance_pb2 as data_v2_pb2)
from gcloud.bigtable._generated import (
Expand All @@ -27,13 +26,22 @@
from gcloud.bigtable.cluster import Cluster
from gcloud.bigtable.cluster import DEFAULT_SERVE_NODES
from gcloud.bigtable.table import Table
from gcloud.operation import Operation
from gcloud.operation import _compute_type_url
from gcloud.operation import _register_type_url


_EXISTING_INSTANCE_LOCATION_ID = 'see-existing-cluster'
_INSTANCE_NAME_RE = re.compile(r'^projects/(?P<project>[^/]+)/'
r'instances/(?P<instance_id>[a-z][-a-z0-9]*)$')


_CREATE_INSTANCE_METADATA_URL = _compute_type_url(
messages_v2_pb2.CreateInstanceMetadata)
_register_type_url(
_CREATE_INSTANCE_METADATA_URL, messages_v2_pb2.CreateInstanceMetadata)


def _prepare_create_request(instance):
"""Creates a protobuf request for a CreateInstance request.

Expand Down