Remove machine from model

Author: jshum2479

operator/src/main/resources/scripts/model-wdt-create-filter.py

@@ -34,6 +34,10 @@ def filter_model(model):
           model['topology']['Server'] = {}
         model['topology']['Server'][admin_server] = {}
 
+      admin = model['topology']['Server'][admin_server]
+      if 'Machine' in admin:
+        del admin['Machine']
+
       if 'Name' in topology:
         model['topology']['Name'] = topology['Name']
 

operator/src/main/resources/scripts/model_wdt_mii_filter.py

@@ -211,6 +211,9 @@ def filter_model(model):
         if 'Server' not in topology:
           topology['Server'] = {}
 
+        if 'Machine' in topology:
+          del topology['Machine']
+
         if admin_server not in topology['Server']:
           topology['Server'][admin_server] = {}
 
@@ -255,6 +258,8 @@ def customizeServerTemplates(model):
   if template_names is not None:
     for template_name in template_names:
       template = serverTemplates[template_name]
+      if 'Machine' in template:
+        del template['Machine']
       cluster_name = getClusterNameOrNone(template)
       if cluster_name is not None:
         customizeServerTemplate(topology, template, template_name)
@@ -378,6 +383,9 @@ def customizeServer(model, server, name):
   if 'AdminServerName' in model['topology'] and len(model['topology']['AdminServerName']) > 0:
     adminServer = model['topology']['AdminServerName']
 
+  if 'Machine' in server:
+    del server['Machine']
+
   customizeLog(name, server)
   customizeAccessLog(name, server)
   customizeDefaultFileStore(server)