fix version regex and api_version formatting to prevent filtering out valid APIs

Author: fabianvf

openshift/ansiblegen/modules.py

@@ -53,7 +53,8 @@ def __get_models_for_package(model_package, api_version, requested_models):
                     continue
                 model_api = matches.group(0)
                 base_model_name = model.replace(model_api, '')
-                model_name_snake = string_utils.camel_case_to_snake(base_model_name)
+                model_name_snake = string_utils.camel_case_to_snake(base_model_name).lower()
+                model_api_snake = string_utils.camel_case_to_snake(model_api).lower()
                 if requested_models and \
                    base_model_name not in requested_models and \
                    model_name_snake not in requested_models:
@@ -64,13 +65,15 @@ def __get_models_for_package(model_package, api_version, requested_models):
                         models.append({
                             'model': model,
                             'model_api': model_api,
+                            'model_api_snake': model_api_snake,
                             'base_model_name': base_model_name,
                             'model_name_snake': model_name_snake
                         })
                 else:
                     models.append({
                         'model': model,
                         'model_api': model_api,
+                        'model_api_snake': model_api_snake,
                         'base_model_name': base_model_name,
                         'model_name_snake': model_name_snake
                     })
@@ -102,18 +105,18 @@ def __generate_modules_impl(cls, models, prefix, output_path):
         temp_dir = os.path.realpath(tempfile.mkdtemp())  # jinja temp dir
         for model in models:
             module_name = "{}_{}_{}.py".format(prefix,
-                                               model['model_api'].lower(),
+                                               model['model_api_snake'],
                                                model['model_name_snake'])
             if prefix == 'openshift':
-                docs = OpenShiftDocStrings(model['model_name_snake'], model['model_api'])
+                docs = OpenShiftDocStrings(model['model_name_snake'], model['model_api_snake'])
             else:
-                docs = KubernetesDocStrings(model['model_name_snake'], model['model_api'])
+                docs = KubernetesDocStrings(model['model_name_snake'], model['model_api_snake'])
             context = {
                 'documentation_string': docs.documentation,
                 'return_string': docs.return_block,
                 'examples_string': docs.examples,
                 'kind': model['model_name_snake'],
-                'api_version': model['model_api']
+                'api_version': model['model_api_snake']
             }
             template_file = prefix + '_module.j2'
             cls.__jinja_render_to_file(JINJA2_TEMPLATE_PATH, template_file,

openshift/helper/__init__.py

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

openshift/helper/base.py

@@ -484,10 +484,12 @@ def get_model(self, api_version, kind):
         :return: class
         """
         camel_kind = string_utils.snake_case_to_camel(kind)
+        camel_api_version = string_utils.snake_case_to_camel(api_version)
         # capitalize the first letter of the string without lower-casing the remainder
-        name = camel_kind[:1].capitalize() + camel_kind[1:]
-        name = name.replace("Api", "API")
-        model_name = api_version.capitalize() + name
+        name = (camel_kind[:1].capitalize() + camel_kind[1:]).replace("Api", "API")
+        api = camel_api_version[:1].capitalize() + camel_api_version[1:]
+
+        model_name = api + name
         try:
             model = self.model_class_from_name(model_name)
         except AttributeError:

scripts/from_gen/preprocess_spec.py

@@ -289,7 +289,7 @@ def main():
 
 
 import re
-VERSION_RX = re.compile("V\d((alpha|beta)\d)?")
+VERSION_RX = re.compile(".*V\d((alpha|beta)\d)?")
 
 DEFAULT_CODEGEN_IGNORE_LINES = {
   ".gitignore",

scripts/preprocess_spec.py.stub

@@ -1,5 +1,5 @@
 import re
-VERSION_RX = re.compile("V\d((alpha|beta)\d)?")
+VERSION_RX = re.compile(".*V\d((alpha|beta)\d)?")
 
 DEFAULT_CODEGEN_IGNORE_LINES = {
   ".gitignore",

tox.ini

@@ -40,6 +40,8 @@ commands =
     /bin/bash update-client.sh
 
 [testenv:update_ansible]
+deps =
+    -rrequirements.txt
 commands =
     openshift-ansible-gen modules {posargs}