openstack/deb-python-openstacksdk
Code Issues Proposed changes

Merge "Allow --data option to pass UUID instead of json"

Browse Source
This commit is contained in:
Jenkins
2014-07-07 19:26:40 +00:00
committed by Gerrit Code Review
parent bbc6ce7240 d41e3952d2
commit 00678ffe98
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/common.py
View File

@@ -39,6 +39,7 @@ import os
import subprocess import subprocess
import sys import sys
import traceback import traceback
import uuid
CONSOLE_MESSAGE_FORMAT = '%(levelname)s: %(name)s %(message)s' CONSOLE_MESSAGE_FORMAT = '%(levelname)s: %(name)s %(message)s'
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
@@ -63,7 +64,11 @@ def find_resource_cls(opts):
def get_data_option(opts): def get_data_option(opts):
return json.loads(opts.data) try:
iddy = uuid.UUID(opts.data)
return {'id': iddy}
except ValueError:
return json.loads(opts.data)
def get_open_fds(): def get_open_fds():