Standardized naming convention

ICG.py

 from ansibleBuilder import *
-from doml2terraform import *
+from terraformBuilder import *
 import json
 import sys
  

ansibleBuilder.py

-import ansibleComponents 
+import ansibleUtils 
 
 class InputData:
     app_type: str
@@ -32,9 +32,9 @@ class AnsibleModule:
 
     def edit_template(self, template_type, template_list, template_data, kind):
         if template_type == "postgres":
-            new_file = ansibleComponents.databases_postgres(template_list, template_data, kind)
+            new_file = ansibleUtils.databases_postgres(template_list, template_data, kind)
         if template_type == "wordpress":
-            new_file = ansibleComponents.service_wordpress(template_list, template_data, kind)  
+            new_file = ansibleUtils.service_wordpress(template_list, template_data, kind)  
         return new_file
 
     def write_file(self, edited_content, code_path: str):

azure.py

+# Azure specific functionalities
\ No newline at end of file

gcp.py

+# Google Clud Platform specific functionalities
\ No newline at end of file

parameters.json

@@ -14,6 +14,13 @@
                 }
             ],
             "vm": [
+                {
+                    "id": 1,
+                    "os": "ubuntu",
+                    "ram": 1,
+                    "cpu": 1,
+                    "name": "firstvm"
+                },
                 {
                     "id": 2,
                     "os": "ubuntu",

functions.py → terraforUtils.py

 from jinja2 import Template, Environment, FileSystemLoader
 import re
+from aws import *
 
 def awsvm(parametri):
     finalString = ""
-    jinjaTemplate = Template(open("VM-templates/AWStemplateVM.txt", "r").read())
+    jinjaTemplate = Template(open("VM-templates/AWStemplateVM.tpl", "r").read())
     for parameter in parametri:
         my_dict = {'vm':'aws_ami',
                     'id': '1', 
@@ -43,18 +44,13 @@ def awsvm(parametri):
             my_dict['ram'] = parameter['ram']
         if 'type' in parameter:
             my_dict['type'] = parameter['type']
-            from amazon import vmcatalog1
             my_dict['instance_type'] = vmcatalog1(my_dict['cpu'], my_dict['ram'], my_dict['sigla'])
         if my_dict['type'] is None:
-            from amazon import vmcatalog
             my_dict['instance_type'] = vmcatalog(my_dict['cpu'], my_dict['ram'])
         if 'instance_type' in parameter:
             my_dict['instance_type'] = parameter['instance_type']
         tm = Template("filter {\n   name   = \"{{ name }}\"\n   values = {{ values }}\n  }")
         string = ''
-        # for elem in my_dict['filter']:
-        #     rend = tm.render(name=elem['name'], values=elem['values'])
-        #     string = string+rend+'\n   '
         render = jinjaTemplate.render(my_dict, filters=string)
         render = re.sub("'", "\"", render)
         finalString = finalString+render+"\n"
@@ -65,7 +61,7 @@ def awsvm(parametri):
 
 def gcpvm(parametri):
     finalString = ""
-    jinjaTemplate = Template(open("VM-templates/GCPtemplateVM.txt", "r").read())
+    jinjaTemplate = Template(open("VM-templates/GCPtemplateVM.tpl", "r").read())
     for parameter in parametri:
         my_dict = {'default': 'default', 'name': 'test', 'machine_type': 'e2-medium', 'zone': 'us-central1-a'}
         if 'default' in parameter:
@@ -86,7 +82,7 @@ def gcpvm(parametri):
 
 def azurevm(parametri):
     finalString = ""
-    jinjaTemplate = Template(open("VM-templates/AZUREtemplateVM.txt", "r").read())
+    jinjaTemplate = Template(open("VM-templates/AZUREtemplateVM.tpl", "r").read())
     for parameter in parametri:
         my_dict = {'source': "hashicorp/azurerm", 'version': "~>2.0", 'name': "<resource_group_name>", 'location': "<location>"}
         if 'source' in parameter:
@@ -107,7 +103,7 @@ def azurevm(parametri):
 
 def networkaws(parametri):
     finalString = ""
-    jinjaTemplate = Template(open("Network-templates/AWStemplateNetwork.txt", "r").read())
+    jinjaTemplate = Template(open("Network-templates/AWStemplateNetwork.tpl", "r").read())
     for parameter in parametri:
         my_dict = {'subname':'subname', 'vpcname': 'vpcname', 'subnet_cidrblock':'subnet_cidrblock', 'vpc_cidr': 'vpc_cidr'}
         if 'subnet_cidrblock' in parameter:
@@ -128,7 +124,7 @@ def networkaws(parametri):
 
 def networkg(parametri):
     finalString = ""
-    jinjaTemplate = Template(open("Network-templates/GCPtemplateNetwork.txt", "r").read())
+    jinjaTemplate = Template(open("Network-templates/GCPtemplateNetwork.tpl", "r").read())
     for parameter in parametri:
         my_dict = {'network':'terraform-network', 'subnetwork': 'terraform-subnetwork'}
         if 'network' in parameter:
@@ -145,7 +141,7 @@ def networkg(parametri):
 
 def networkaz(parametri):
     finalString = ""
-    jinjaTemplate = Template(open("Network-templates/AZUREtemplateNetwork.txt", "r").read())
+    jinjaTemplate = Template(open("Network-templates/AZUREtemplateNetwork.tpl", "r").read())
     for parameter in parametri:
         my_dict = {'name':'my-resources', 'subnet_names': ["subnet1", "subnet2", "subnet3"]}
         if 'name' in parameter:
@@ -171,7 +167,7 @@ def networkaz(parametri):
 
 def awsdb(parametri):
     finalString = ""
-    jinjaTemplate = Template(open("DB-templates/AWStemplateDB.txt", "r").read())
+    jinjaTemplate = Template(open("DB-templates/AWStemplateDB.tpl", "r").read())
     for parameter in parametri: 
         my_dict = {'identifier':'education', 'instance':'db.t3.micro', 'storage':'5', 'engine':'postgres', 'version':'13.1', 'username': 'edu', 'password':'var.db_password', 'subnet': 'aws_db_subnet_group.education.name', 'security': '[aws_security_group.rds.id]', 'parameter': 'aws_db_parameter_group.education.name', 'accessible': 'true', 'skip': 'true'}
         if 'identifier' in parameter:
@@ -208,7 +204,7 @@ def awsdb(parametri):
 
 def azuredb(parametri):
     finalString = ""
-    jinjaTemplate = Template(open("DB-templates/AZUREtemplateDB.txt", "r").read())
+    jinjaTemplate = Template(open("DB-templates/AZUREtemplateDB.tpl", "r").read())
     for parameter in parametri:
         my_dict = {'name':'sqldbtf01', 'group_name':'${azurerm_resource_group.test2.name}', 'location':'North Central US', 'server_name':'${azurerm_sql_server.test2.name}', 'state':'Enabled', 'email':'["dbgrl93@gmail.com"]', 'days':'30', 'access_key':'${azurerm_storage_account.test2sa.primary_access_key}', 'endpoint':'${azurerm_storage_account.test2sa.primary_blob_endpoint}', 'default':'Enabled'}
         if 'name' in parameter:
@@ -243,7 +239,7 @@ def azuredb(parametri):
 
 def googlesql(parametri):
     finalString = ""
-    jinjaTemplate = Template(open("DB-templates/GCPtemplateDB.txt", "r").read())
+    jinjaTemplate = Template(open("DB-templates/GCPtemplateDB.tpl", "r").read())
     for parameter in parametri:
         my_dict = {'name':'my-database', 'instance':'google_sql_database_instance.instance.name', 'instance_name':'my-database-instance','region':'us-central1', 'tier':'db-f1-micro', 'deletion_protection':'true'}
         if 'name' in parameter:
@@ -267,7 +263,7 @@ def googlesql(parametri):
     create_file.close()
 
 def postgresql(parametri):
-    jinjaTemplate = Template(open("DB-templates/AWStemplateDB.txt", "r").read())
+    jinjaTemplate = Template(open("DB-templates/AWStemplateDB.tpl", "r").read())
     my_dict = {'name': 'my_db', 'owner': 'my_role', 'template': 'template0', 'lc_collate':'C', 'connection_limit':-1, 'allow_connections': 'true'}
     if 'name' in parametri:
         my_dict['name'] = parametri['name']

doml2terraform.py → terraformBuilder.py

 import json
 import yaml
-#import toscaparser
+from terraforUtils import *
 import sys
  
 
@@ -8,29 +8,20 @@ def TerraformICG(parameters):
     if 'vm' in parameters:
         if (parameters['provider']=='aws'):
             if 'vm' in parameters:
-                from functions import awsvm
                 awsvm(parameters['vm'])
             if 'network' in parameters:
-                from functions import networkaws
                 networkaws(parameters['network'])
             if 'db' in parameters:
-                from functions import awsdb
                 awsdb(parameters['db'])
         elif (parameters['provider']=='gcp'):
-            from functions import gcpvm
             gcpvm(parameters['vm'])
             if 'network' in parameters:
-                from functions import networkg
                 networkg(parameters['network'])
             if 'db' in parameters:
-                from functions import googlesql
                 googlesql(parameters['db'])
         elif (parameters['provider']=='azure'):
-            from functions import azurevm
             azurevm(parameters['vm'])
             if 'network' in parameters:
-                from functions import networkaz
                 networkaz(parameters['network'])
             if 'db' in parameters:
-                from functions import azuredb
                 azuredb(parameters['db'])
\ No newline at end of file