Backup, adding more tests

Author: Anton Benkevich

almdrlib/client.py

@@ -799,6 +799,7 @@ def _normalize_schema(name, schema, required=False):
         return schema
 
     if compound_schema:
+        # TODO move to alertlogic-sdk-definitions normalize_node
         if oneof:
             xof = OpenAPIKeyWord.ONE_OF
         elif anyof:
@@ -829,10 +830,11 @@ def add_xof(item):
             else:
                 return item
 
-        allprops = reduce(lambda acc, s: acc + list(s.get(OpenAPIKeyWord.PROPERTIES).items()), compound_schema, [])
+        allprops = reduce(lambda acc, s: acc + list(s.get(OpenAPIKeyWord.PROPERTIES, OrderedDict()).items()),
+                          compound_schema, [])
         reduced = reduce(reduce_props, allprops, OrderedDict())
         compound_props = OrderedDict(map(add_xof, reduced.items()))
-        properties = compound_props 
+        properties = compound_props
 
     if not properties:
         properties = OrderedDict({

tests/apis/testapi/testapi.v1.yaml

@@ -16,6 +16,35 @@ servers:
     description: integration
     x-alertlogic-session-endpoint: true
 paths:
+  '/testapi/v1/postdata':
+    post:
+      operationId: post_data_compound
+      requestBody:
+        content:
+          application/json:
+            schema:
+              oneOf:
+                - type: object
+                  properties:
+                    prop:
+                      type: string
+                  additionalProperties: true
+                - type: object
+                  properties:
+                    prop:
+                      type: integer
+                - type: string
+      responses:
+        '200':
+          description: 200 resp
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  prop:
+                    type: string
+
   '/testapi/v1/{account_id}/test_get_data':
     get:
       summary: Test Get Data Operation

tests/test_open_api_support.py

@@ -11,7 +11,7 @@
 from almdrlib.client import Config
 from almdrlib.client import Operation
 from alsdkdefs import OpenAPIKeyWord
-
+from collections import OrderedDict
 
 class TestSdk_open_api_support(unittest.TestCase):
     """Tests for `python_boilerplate` package."""
@@ -83,3 +83,14 @@ def test_003_default_objects_creation(self):
         self.assertIsInstance(Session(), Session)
         self.assertIsInstance(Config(), Config)
         self.assertIsInstance(Client(self._service_name), Client)
+
+    def test_004_test_operations_compound_schema(self):
+        """Test request body properties are properly normalized when schema is compound at the top level"""
+        client = Client(self._service_name)
+        operation = client.operations.get('post_data_compound')
+        self.assertEqual(OrderedDict([('prop',
+                                       OrderedDict([('oneOf', [
+                                           OrderedDict([('type', 'integer')]),
+                                           OrderedDict([('type', 'string')])
+                                       ])]))]),
+                         operation.body._content['application/json']._properties)