[CORD-2349] Correctly converting int32 to integer to allow migration of TOSCA recipes
Change-Id: Ifbe9bebc2ecb12accc67d5990fcb94fb03a8a1fb
diff --git a/lib/xos-genx/xosgenx/jinja2_extensions/base.py b/lib/xos-genx/xosgenx/jinja2_extensions/base.py
index d3982f1..0849ab9 100644
--- a/lib/xos-genx/xosgenx/jinja2_extensions/base.py
+++ b/lib/xos-genx/xosgenx/jinja2_extensions/base.py
@@ -239,21 +239,6 @@
return options_str
-def xproto_tosca_required(null, blank, default=None):
-
- if null == 'True' or blank == 'True' or default != 'False':
- return "false"
- return "true"
-
-def xproto_tosca_field_type(type):
- """
- TOSCA requires fields of type 'bool' to be 'boolean'
- """
- if type == "bool":
- return "boolean"
- else:
- return type
-
def xproto_type_to_swagger_type(f):
try:
content_type = f['options']['content_type']
diff --git a/lib/xos-genx/xosgenx/jinja2_extensions/tosca.py b/lib/xos-genx/xosgenx/jinja2_extensions/tosca.py
index 04ac3ff..a46770d 100644
--- a/lib/xos-genx/xosgenx/jinja2_extensions/tosca.py
+++ b/lib/xos-genx/xosgenx/jinja2_extensions/tosca.py
@@ -12,6 +12,25 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+def xproto_tosca_required(null, blank, default=None):
+
+ if null == 'True' or blank == 'True' or default != 'False':
+ return "false"
+ return "true"
+
+def xproto_tosca_field_type(type):
+ """
+ TOSCA requires fields of type 'bool' to be 'boolean'
+ TOSCA requires fields of type 'int32' to be 'integer'
+ """
+
+ if type == "bool":
+ return "boolean"
+ elif type == "int32":
+ return "integer"
+ else:
+ return type
+
def xproto_fields_to_tosca_keys(fields):
keys = []
# look for explicit keys