Skip to content

Adds cloud client for remaining Cloud IoT Core apis #2479

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
merged 1 commit into from
Oct 18, 2019
Merged

Adds cloud client for remaining Cloud IoT Core apis #2479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 29 additions & 46 deletions iot/api-client/manager/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"""

import argparse
import base64
import io
import os
import sys
Expand Down Expand Up @@ -464,20 +463,13 @@ def set_config(
version, config):
# [START iot_set_device_config]
print('Set device configuration')
client = get_client(service_account_json)
device_path = 'projects/{}/locations/{}/registries/{}/devices/{}'.format(
project_id, cloud_region, registry_id, device_id)

config_body = {
'versionToUpdate': version,
'binaryData': base64.urlsafe_b64encode(
config.encode('utf-8')).decode('ascii')
}
client = iot_v1.DeviceManagerClient()
device_path = client.device_path(
project_id, cloud_region, registry_id, device_id)

return client.projects(
).locations().registries(
).devices().modifyCloudToDeviceConfig(
name=device_path, body=config_body).execute()
data = config.encode('utf-8')

return client.modify_cloud_to_device_config(device_path, data, version)
# [END iot_set_device_config]


Expand All @@ -486,21 +478,17 @@ def get_config_versions(
device_id):
"""Lists versions of a device config in descending order (newest first)."""
# [START iot_get_device_configs]
client = get_client(service_account_json)
registry_name = 'projects/{}/locations/{}/registries/{}'.format(
project_id, cloud_region, registry_id)

device_name = '{}/devices/{}'.format(registry_name, device_id)
devices = client.projects().locations().registries().devices()
configs = devices.configVersions().list(
name=device_name).execute().get(
'deviceConfigs', [])

for config in configs:
print('version: {}\n\tcloudUpdateTime: {}\n\t binaryData: {}'.format(
config.get('version'),
config.get('cloudUpdateTime'),
config.get('binaryData')))
client = iot_v1.DeviceManagerClient()
device_path = client.device_path(
project_id, cloud_region, registry_id, device_id)

configs = client.list_device_config_versions(device_path)

for config in configs.device_configs:
print('version: {}\n\tcloudUpdateTime: {}\n\t data: {}'.format(
config.version,
config.cloud_update_time,
config.binary_data))

return configs
# [END iot_get_device_configs]
Expand Down Expand Up @@ -546,19 +534,13 @@ def send_command(
"""Send a command to a device."""
# [START iot_send_command]
print('Sending command to device')
client = get_client(service_account_json)
device_path = 'projects/{}/locations/{}/registries/{}/devices/{}'.format(
project_id, cloud_region, registry_id, device_id)
client = iot_v1.DeviceManagerClient()
device_path = client.device_path(
project_id, cloud_region, registry_id, device_id)

config_body = {
'binaryData': base64.urlsafe_b64encode(
command.encode('utf-8')).decode('ascii')
}
data = command.encode('utf-8')

return client.projects(
).locations().registries(
).devices().sendCommandToDevice(
name=device_path, body=config_body).execute()
return client.send_command_to_device(device_path, data)
# [END iot_send_command]


Expand All @@ -578,10 +560,10 @@ def create_gateway(
if device.id == gateway_id:
exists = True
print('Device: {} : {} : {} : {}'.format(
device.get('id'),
device.get('numId'),
device.get('config'),
device.get('gatewayConfig')
device.id,
device.num_id,
device.config,
device.gateway_config
))

with io.open(certificate_file) as f:
Expand Down Expand Up @@ -759,7 +741,8 @@ def parse_command_line_args():
help='Path to service account json file.')
parser.add_argument(
'--version',
default=None,
default=0,
type=int,
help='Version number for setting device configuration.')

# Command subparser
Expand Down Expand Up @@ -841,7 +824,7 @@ def run_get(args):
args.cloud_region, args.registry_id, args.device_id)

elif args.command == 'get-config-versions':
get_device(
get_config_versions(
args.service_account_json, args.project_id,
args.cloud_region, args.registry_id, args.device_id)

Expand Down
6 changes: 5 additions & 1 deletion iot/api-client/manager/manager_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,10 @@ def test_add_config_unauth_device(test_topic, capsys):
service_account_json, project_id, cloud_region, registry_id,
device_id)

manager.get_config_versions(
service_account_json, project_id, cloud_region, registry_id,
device_id)

manager.delete_device(
service_account_json, project_id, cloud_region, registry_id,
device_id)
Expand Down Expand Up @@ -369,7 +373,7 @@ def test_send_command(test_topic, capsys):
devices = manager.list_devices(
service_account_json, project_id, cloud_region, registry_id)
for device in devices:
if device.get('id') == device_id:
if device.id == device_id:
exists = True

if not exists:
Expand Down