Fixes for CPU, Mem in CMP

Author: mbomb67

onefuse/__init__.py

@@ -4,5 +4,5 @@
 Enables the execution of OneFuse policies via Python
 """
 
-__version__ = "2022.3.1"
+__version__ = "2022.3.2"
 __credits__ = 'Cloudbolt Software, Inc.'

onefuse/admin.py

@@ -966,6 +966,8 @@ def render(self, template: str, template_properties: dict,
             Set). Default: "value"
         """
         try:
+            if type(template) != str:
+                return template
             if template.find('{%') == -1 and template.find('{{') == -1:
                 return template
             json_template = {

onefuse/backups.py

@@ -495,7 +495,7 @@ def restore_single_policy(self, json_path: str, overwrite: bool = False):
                 detail = response.json()["detail"]
             except:
                 self.ofm.logger.error('Response JSON detail cannot be '
-                                      'accessed', response=response)
+                                      f'accessed. response: {response}')
                 raise
             if detail == 'Not found.':
                 # This may happen when script is run against older

onefuse/cloudbolt_admin.py

@@ -170,6 +170,12 @@ def render_and_apply_properties(self, properties: dict, resource,
                         from infrastructure.models import Environment
                         resource.environment = Environment.objects.filter(
                             name=rendered_value).first()
+                    elif rendered_key == 'cpu_cnt':
+                        resource.cpu_cnt = rendered_value
+                        resource.save()
+                    elif rendered_key == 'mem_size':
+                        resource.mem_size = rendered_value
+                        resource.save()
                     else:
                         try:
                             resource.set_value_for_custom_field(rendered_key,

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='onefuse',
-    version='2022.3.1',
+    version='2022.3.2',
     author='Cloudbolt Software, Inc.',
     author_email='support@cloudbolt.io',
     description='OneFuse upstream provider package for Python',