catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Generate proper empty value for XML/JSON

Browse source
This commit is contained in:
Taro Sato 2016-10-16 21:49:10 -07:00
commit b632df3aa4
3 changed files with 41 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
moto/core/responses.py
View file

@ -1,6 +1,7 @@
from __future__ import unicode_literals
import datetime
import json
import logging
import re
from boto.exception import JSONResponseError
@ -17,6 +18,9 @@ from moto.compat import OrderedDict
from moto.core.utils import camelcase_to_underscores, method_names_from_class
log = logging.getLogger(__name__)
def _decode_dict(d):
decoded = {}
for key, value in d.items():
@ -544,11 +548,20 @@ def xml_to_json_response(service_spec, operation, xml, result_node=None):
od = OrderedDict()
for k, v in value.items():
if k.startswith('@') or v is None:
if k.startswith('@'):
continue
if k not in spec:
# this can happen when with an older version of
# botocore for which the node in XML template is not
# defined in service spec.
log.warning('Field %s is not defined by the botocore version in use', k)
continue
if spec[k]['type'] == 'list':
if len(spec[k]['member']) == 1:
if v is None:
od[k] = []
elif len(spec[k]['member']) == 1:
if isinstance(v['member'], list):
od[k] = transform(v['member'], spec[k]['member'])
else:
@ -560,11 +573,17 @@ def xml_to_json_response(service_spec, operation, xml, result_node=None):
else:
raise ValueError('Malformatted input')
elif spec[k]['type'] == 'map':
key = from_str(v['entry']['key'], spec[k]['key'])
val = from_str(v['entry']['value'], spec[k]['value'])
od[k] = {key: val}
if v is None:
od[k] = {}
else:
key = from_str(v['entry']['key'], spec[k]['key'])
val = from_str(v['entry']['value'], spec[k]['value'])
od[k] = {key: val}
else:
od[k] = transform(v, spec[k])
if v is None:
od[k] = None
else:
od[k] = transform(v, spec[k])
return od
dic = xmltodict.parse(xml)

11
moto/emr/models.py
View file

@ -24,12 +24,19 @@ class FakeBootstrapAction(object):
class FakeInstanceGroup(object):
def __init__(self, instance_count, instance_role, instance_type, market, name,
id=None, bid_price=None):
def __init__(self, instance_count, instance_role, instance_type,
market='ON_DEMAND', name=None, id=None, bid_price=None):
self.id = id or random_instance_group_id()
self.bid_price = bid_price
self.market = market
if name is None:
if instance_role == 'MASTER':
name = 'master'
elif instance_role == 'CORE':
name = 'slave'
else:
name = 'Task instance group'
self.name = name
self.num_instances = instance_count
self.role = instance_role