Merge pull request #143 from fabianvf/fix-intorstr-object

Add object to primitives, treat as string for now

Author: djzager

openshift/ansiblegen/docstrings.py

@@ -141,7 +141,7 @@ def add_option(pname, pdict, descr=None):
                 for path in param_dict['property_path']:
                     path = PYTHON_KEYWORD_MAPPING.get(path, path)
                     kind = model_class.swagger_types[path]
-                    if kind in ('str', 'bool', 'int', 'IntstrIntOrString', 'datetime', 'object', 'float') or \
+                    if kind in ('str', 'bool', 'int', 'datetime', 'object', 'float') or \
                        kind.startswith('dict(') or \
                        kind.startswith('list['):
                         docs = inspect.getdoc(getattr(model_class, path))
@@ -260,6 +260,11 @@ def __get_attributes(self, model_class, doc_key=None):
                     doc_key[attribute]['description'] = string_list
                     doc_key[attribute]['type'] = 'complex'
                     doc_key[attribute]['contains'] = CommentedMap()
+                elif kind == 'object':
+                    doc_key[attribute] = CommentedMap()
+                    doc_key[attribute]['description'] = string_list
+                    doc_key[attribute]['type'] = 'complex'
+                    doc_key[attribute]['contains'] = CommentedMap()
                 else:
                     doc_key[attribute] = CommentedMap()
                     doc_key[attribute]['description'] = string_list

openshift/helper/__init__.py

@@ -3,5 +3,5 @@
 
 import re
 
-PRIMITIVES = ('str', 'int', 'bool', 'float', 'IntstrIntOrString')
+PRIMITIVES = ('str', 'int', 'bool', 'float', 'object')
 VERSION_RX = re.compile(".*V\d((alpha|beta)\d)?")

openshift/helper/ansible.py

@@ -517,7 +517,7 @@ def __compare_obj_list(self, src_value, request_value, obj_class, param_name):
                                 obj_type = item_kind.replace('list[', '').replace(']', '')
                                 if getattr(obj, snake_key) is None:
                                     setattr(obj, snake_key, [])
-                                if obj_type not in ('str', 'int', 'bool'):
+                                if obj_type not in ('str', 'int', 'bool', 'object'):
                                     self.__compare_obj_list(getattr(obj, snake_key), value, obj_type, param_name)
                                 else:
                                     # Straight list comparison
@@ -608,7 +608,7 @@ def __transform_properties(self, properties, prefix='', path=None, alternate_pre
         :return: dict
         """
         parent_property_classes = parent_property_classes or set()
-        primitive_types = list(PRIMITIVES) + ['list', 'dict', 'object']
+        primitive_types = list(PRIMITIVES) + ['list', 'dict']
         args = {}
 
         if path is None:
@@ -710,7 +710,7 @@ def add_meta(prop_name, prop_prefix, prop_alt_prefix):
                 paths.append(prop)
 
                 property_type = prop_attributes['class'].__name__
-                if property_type == 'IntstrIntOrString':
+                if property_type == 'object':
                     property_type = 'str'
 
                 args[arg_prefix + prop] = {

openshift/helper/base.py

@@ -167,6 +167,11 @@ def fix_serialization(self, obj):
                     port.target_port = int(port.target_port)
                 except ValueError:
                     pass
+        elif obj and obj.kind == "Route" and obj.spec.port:
+            try:
+                obj.spec.port.target_port = int(obj.spec.port.target_port)
+            except ValueError:
+                pass
         return obj
 
     def get_object(self, name=None, namespace=None):