Merge pull request KscSDK#6 from wcg49802693/master

liuyichen · web-flow · commit 4e44b6745b51 · 2016-11-08T11:28:09.000+08:00
需求的完成和配置文件错误的修改
diff --git a/kscore/client.py b/kscore/client.py
@@ -557,8 +557,21 @@ def _convert_to_request_dict(self, api_params, operation_model,
                 operation_name=operation_name),
             params=api_params, model=operation_model, context=context)
 
-        request_dict = self._serializer.serialize_to_request(
-            api_params, operation_model)
+        operation_protocol_serialize = None
+        if operation_model._operation_model.has_key('protocol'):
+            operation_protocol = operation_model._operation_model['protocol']
+            if operation_protocol is not None:
+                operation_protocol_serialize = kscore.serialize.create_serializer(
+                    operation_protocol, True)
+
+        if operation_protocol_serialize is not None:
+            request_dict = operation_protocol_serialize.serialize_to_request(
+                api_params, operation_model
+            )
+        else:
+            request_dict = self._serializer.serialize_to_request(
+                api_params, operation_model)
+
         prepare_request_dict(request_dict, endpoint_url=self._endpoint.host,
                              user_agent=self._client_config.user_agent)
         return request_dict
diff --git a/kscore/data/kog/2016-05-13/service-2.yaml b/kscore/data/kog/2016-05-13/service-2.yaml
@@ -888,7 +888,7 @@ shapes:
     key:
       shape: NonEmptyString
     value:
-      shape: NonEmptyString
+      shape: Id
 
   # [{'a': 'xxxx'}, {'b': 'xxxx'}]
   Maps:
@@ -1826,6 +1826,17 @@ shapes:
     documentation: ""
 
   # ======== 批量删除变量的参数配置 ========
+  BatchDelVbMaps:
+    type: list
+    member:
+      shape: BatchDelVbMap
+
+  BatchDelVbMap:
+    type: map
+    key:
+      shape: NonEmptyString
+    value:
+      shape: NonEmptyString
 
   BatchDeleteVariable:
     type: structure
@@ -1837,7 +1848,7 @@ shapes:
         shape: Id
         documentation: ""
       varList:
-        shape: Maps
+        shape: BatchDelVbMaps
         documentation: ""
     documentation: ""
 
diff --git a/kscore/endpoint.py b/kscore/endpoint.py
@@ -197,8 +197,14 @@ def _get_response(self, request, operation_model, attempts):
         # This returns the http_response and the parsed_data.
         response_dict = convert_to_response_dict(http_response,
                                                  operation_model)
-        parser = self._response_parser_factory.create_parser(
-            operation_model.metadata['protocol'])
+
+        protocol = operation_model.metadata['protocol']
+        if operation_model._operation_model.has_key('protocol'):
+            operation_protocol = operation_model._operation_model['protocol']
+            if operation_protocol is not None:
+                protocol = operation_protocol
+        parser = self._response_parser_factory.create_parser(protocol)
+
         return ((http_response,
                  parser.parse(response_dict, operation_model.output_shape)),
                 None)
diff --git a/kscore/parsers.py b/kscore/parsers.py
@@ -784,6 +784,7 @@ def _parse_error_from_body(self, response):
     'query': QueryParser,
     'query-json': JSONParser,
     'kcs': JSONParser,
+    'custom-body': JSONParser,
     'json': JSONParser,
     'json2': JSONParser,
     'rest-json': RestJSONParser,
diff --git a/kscore/serialize.py b/kscore/serialize.py
@@ -194,13 +194,12 @@ def serialize_to_request(self, parameters, operation_model):
                 'X-Version': operation_model.metadata['apiVersion'],
             }
         )
-        body_params = {}
+        body_params = self.MAP_TYPE()
 
         if shape is not None:
             self._serialize(body_params, parameters, shape)
         else:
             self._serialize_not_shape(body_params, parameters)
-
         return self._serialize_data(serialized, body_params)
 
     def _serialize_not_shape(self, data, parameters):
@@ -349,6 +348,48 @@ def _serialize_data(self, serialized, data):
         return serialized
 
 
+class CustomBodySerializer(QuerySerializer):
+
+    @property
+    def headers(self):
+        return {"Accept": 'application/json'}
+
+    def _serialize_not_shape(self, data, parameters):
+
+        data.update(parameters)
+
+    def serialize_to_request(self, parameters, operation_model):
+        shape = operation_model.input_shape
+        serialized = self._create_default_request()
+        serialized['method'] = operation_model.http.get('method',
+                                                        self.DEFAULT_METHOD)
+        # The query serializer only deals with body params so
+        # that's what we hand off the _serialize_* methods.
+        serialized['headers'].update(
+            {
+                'X-Action': operation_model.name,
+                'X-Version': operation_model.metadata['apiVersion'],
+            }
+        )
+        body_params = self.MAP_TYPE()
+        if 'Body' in parameters:
+            body_params['Body'] = parameters['Body']
+            del parameters['Body']
+
+        if shape is not None:
+            self._serialize(body_params, parameters, shape)
+        else:
+            self._serialize_not_shape(body_params, parameters)
+        return self._serialize_data(serialized, body_params)
+
+    def _serialize_data(self, serialized, data):
+        serialized['body'] = json.dumps(data).encode(self.DEFAULT_ENCODING)
+        if 'Body' in data:
+            del data['Body']
+        serialized['query_string'] = data
+        return serialized
+
+
 class JSONSerializer(Serializer):
     """
         BASE JSON REQUEST all method with json body
@@ -371,7 +412,7 @@ def serialize_to_request(self, parameters, operation_model):
             'X-Action': operation_model.name,
             'X-Version': operation_model.metadata['apiVersion']
         }
-        body = {}
+        body = self.MAP_TYPE()
         input_shape = operation_model.input_shape
         if input_shape is not None:
             self._serialize(body, parameters, input_shape)
@@ -718,4 +759,5 @@ def _default_serialize(self, xmlnode, params, shape, name):
     'json2': NotGetJsonSerializer,
     'rest-json': RestJSONSerializer,
     'rest-xml': RestXMLSerializer,
+    'custom-body': CustomBodySerializer,
 }
