1 files changed, 14 insertions, 28 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ToscaEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ToscaEnricher.java
index 2c0f03480f..854d84ad84 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ToscaEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ToscaEnricher.java
@@ -20,11 +20,11 @@
 
 package org.openecomp.sdc.enrichment.impl.tosca;
 
+import org.openecomp.sdc.common.utils.CommonUtil;
 import org.openecomp.sdc.datatypes.error.ErrorMessage;
 import org.openecomp.sdc.enrichment.inter.Enricher;
+import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
 import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
-import org.openecomp.sdc.tosca.datatypes.model.NodeType;
-import org.openecomp.sdc.tosca.services.ToscaUtil;
 
 import java.util.HashMap;
 import java.util.List;
@@ -32,42 +32,28 @@ import java.util.Map;
 
 public class ToscaEnricher extends Enricher {
 
-  Map<String, List<NodeType>> componentTypNodeTypeMap;
+  private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
 
   @Override
   public Map<String, List<ErrorMessage>> enrich() {
     Map<String, List<ErrorMessage>> errors = new HashMap<>();
-    Map<String, List<ErrorMessage>> enrichResponse;
-    enrichResponse = enrichCilometer();
-    errors.putAll(enrichResponse);
-    enrichResponse = enrichSnmp();
-    errors.putAll(enrichResponse);
-
+    errors.putAll(enrichAbstractSubstitute());
 
     return errors;
   }
 
-  private Map<String, List<ErrorMessage>> enrichCilometer() {
-    Map<String, List<ErrorMessage>> enrichResponse;
-
-    ToscaServiceModel toscaModel = (ToscaServiceModel) model;
-
-    componentTypNodeTypeMap =
-        ToscaUtil.normalizeComponentNameNodeType(toscaModel, input.getEntityInfo().keySet());
-
-    enrichResponse = CeilometerEnricher.enrich(toscaModel, componentTypNodeTypeMap, this.input);
+  private Map<String, List<ErrorMessage>> enrichAbstractSubstitute() {
+    mdcDataDebugMessage.debugEntryMessage(null, null);
 
-    return enrichResponse;
-  }
+    Map<String, List<ErrorMessage>> enrichErrors;
 
+    ToscaServiceModel toscaModel = (ToscaServiceModel) model;
+    AbstractSubstituteToscaEnricher abstractSubstituteToscaEnricher =
+        new AbstractSubstituteToscaEnricher();
+    enrichErrors = abstractSubstituteToscaEnricher.enrich(toscaModel, data.getKey(),
+        data.getVersion());
 
-  private Map<String, List<ErrorMessage>> enrichSnmp() {
-    Map<String, List<ErrorMessage>> enrichResponse;
-
-    enrichResponse = SnmpEnricher.enrich(componentTypNodeTypeMap, this.input);
-
-    return enrichResponse;
+    mdcDataDebugMessage.debugExitMessage(null, null);
+    return enrichErrors;
   }
-
-
 }