CGMES functional logs (first steps)

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/CgmesReports.java

@@ -21,6 +21,42 @@ private CgmesReports() {
     }
 
     // INFO
+    public static void applyingPreprocessorsReport(ReportNode reportNode) {
+        reportNode.newReportNode()
+                .withMessageTemplate("applyingPreprocessors", "Applying preprocessors.")
+                .withSeverity(TypedValue.INFO_SEVERITY)
+                .add();
+    }
+
+    public static ReportNode convertingElementTypeReport(ReportNode reportNode, String elementType) {
+        return reportNode.newReportNode()
+                .withMessageTemplate("convertingElementType", "Converting ${elementType}.")
+                .withUntypedValue("elementType", elementType)
+                .withSeverity(TypedValue.INFO_SEVERITY)
+                .add();
+    }
+
+    public static ReportNode fixingDanglingLinesIssuesReport(ReportNode reportNode) {
+        return reportNode.newReportNode()
+                .withMessageTemplate("fixingDanglingLinesIssues", "Fixing issues with dangling lines.")
+                .withSeverity(TypedValue.INFO_SEVERITY)
+                .add();
+    }
+
+    public static ReportNode settingVoltagesAndAnglesReport(ReportNode reportNode) {
+        return reportNode.newReportNode()
+                .withMessageTemplate("settingVoltagesAndAngles", "Setting voltages and angles.")
+                .withSeverity(TypedValue.INFO_SEVERITY)
+                .add();
+    }
+
+    public static void applyingPostprocessorsReport(ReportNode reportNode) {
+        reportNode.newReportNode()
+                .withMessageTemplate("applyingPostprocessors", "Applying postprocessors.")
+                .withSeverity(TypedValue.INFO_SEVERITY)
+                .add();
+    }
+
     public static void importedCgmesNetworkReport(ReportNode reportNode, String networkId) {
         reportNode.newReportNode()
                 .withMessageTemplate("importedCgmesNetwork", "CGMES network ${networkId} is imported.")
@@ -71,6 +107,14 @@ public static void invalidAngleVoltageNodeReport(ReportNode reportNode, String n
                 .add();
     }
 
+    public static void removingUnattachedHvdcConverterStationReport(ReportNode reportNode, String converterId) {
+        reportNode.newReportNode()
+                .withMessageTemplate("removingUnattachedHvdcConverterStation", "HVDC Converter Station ${converterId} will be removed since it has no attached HVDC line.")
+                .withUntypedValue("converterId", converterId)
+                .withSeverity(TypedValue.WARN_SEVERITY)
+                .add();
+    }
+
     // ERROR
     public static void inconsistentProfilesTPRequiredReport(ReportNode reportNode, String networkId) {
         reportNode.newReportNode()

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/Context.java

@@ -42,6 +42,7 @@ public Context(CgmesModel cgmes, Config config, Network network, ReportNode repo
         this.config = Objects.requireNonNull(config);
         this.network = Objects.requireNonNull(network);
         this.reportNode = Objects.requireNonNull(reportNode);
+        pushReportNode(reportNode);
 
         // Even if the CGMES model is node-breaker,
         // we could decide to ignore the connectivity nodes and
@@ -207,10 +208,22 @@ public PropertyBags phaseTapChangerTable(String tableId) {
 
     // Handling issues found during conversion
 
-    public ReportNode getReportNode() {
+    public ReportNode getRootReportNode() {
         return reportNode;
     }
 
+    public ReportNode getReportNode() {
+        return network.getReportNodeContext().getReportNode();
+    }
+
+    public void pushReportNode(ReportNode node) {
+        network.getReportNodeContext().pushReportNode(node);
+    }
+
+    public ReportNode popReportNode() {
+        return network.getReportNodeContext().popReportNode();
+    }
+
     private enum ConversionIssueCategory {
         INVALID("Invalid"),
         IGNORED("Ignored"),

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/BusbarSectionConversion.java

@@ -9,6 +9,7 @@
 package com.powsybl.cgmes.conversion.elements;
 
 import com.powsybl.cgmes.conversion.Context;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.iidm.network.Bus;
 import com.powsybl.iidm.network.BusbarSection;
 import com.powsybl.iidm.network.BusbarSectionAdder;
@@ -23,7 +24,7 @@
 public class BusbarSectionConversion extends AbstractConductingEquipmentConversion {
 
     public BusbarSectionConversion(PropertyBag bbs, Context context) {
-        super("BusbarSection", bbs, context);
+        super(CgmesNames.BUSBAR_SECTION, bbs, context);
     }
 
     @Override

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/EnergyConsumerConversion.java

@@ -10,6 +10,7 @@
 
 import com.powsybl.cgmes.conversion.Context;
 import com.powsybl.cgmes.conversion.Conversion;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.iidm.network.Load;
 import com.powsybl.iidm.network.LoadAdder;
 import com.powsybl.iidm.network.LoadType;
@@ -23,7 +24,7 @@
 public class EnergyConsumerConversion extends AbstractConductingEquipmentConversion {
 
     public EnergyConsumerConversion(PropertyBag ec, Context context) {
-        super("EnergyConsumer", ec, context);
+        super(CgmesNames.ENERGY_CONSUMER, ec, context);
         loadKind = ec.getLocal("type");
     }
 

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/EquivalentBranchConversion.java

@@ -10,6 +10,7 @@
 
 import com.powsybl.cgmes.conversion.Context;
 import com.powsybl.cgmes.conversion.ConversionException;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.iidm.network.DanglingLine;
 import com.powsybl.iidm.network.Line;
@@ -26,7 +27,7 @@ public class EquivalentBranchConversion extends AbstractBranchConversion impleme
     private DanglingLine danglingLine;
 
     public EquivalentBranchConversion(PropertyBag b, Context context) {
-        super("EquivalentBranch", b, context);
+        super(CgmesNames.EQUIVALENT_BRANCH, b, context);
     }
 
     @Override

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/EquivalentShuntConversion.java

@@ -9,6 +9,7 @@
 
 import com.powsybl.cgmes.conversion.Context;
 import com.powsybl.cgmes.conversion.Conversion;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.iidm.network.ShuntCompensator;
 import com.powsybl.iidm.network.ShuntCompensatorAdder;
 import com.powsybl.triplestore.api.PropertyBag;
@@ -19,7 +20,7 @@
 public class EquivalentShuntConversion extends AbstractConductingEquipmentConversion {
 
     public EquivalentShuntConversion(PropertyBag p, Context context) {
-        super("EquivalentShunt", p, context);
+        super(CgmesNames.EQUIVALENT_SHUNT, p, context);
     }
 
     @Override

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/ExternalNetworkInjectionConversion.java

@@ -11,21 +11,20 @@
 import com.powsybl.cgmes.conversion.Context;
 import com.powsybl.cgmes.conversion.Conversion;
 import com.powsybl.cgmes.conversion.RegulatingControlMappingForGenerators;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.cgmes.model.PowerFlow;
 import com.powsybl.iidm.network.EnergySource;
 import com.powsybl.iidm.network.Generator;
 import com.powsybl.iidm.network.GeneratorAdder;
 import com.powsybl.triplestore.api.PropertyBag;
 
-import static com.powsybl.cgmes.model.CgmesNames.EXTERNAL_NETWORK_INJECTION;
-
 /**
  * @author Luma Zamarreño {@literal <zamarrenolm at aia.es>}
  */
 public class ExternalNetworkInjectionConversion extends AbstractReactiveLimitsOwnerConversion {
 
     public ExternalNetworkInjectionConversion(PropertyBag sm, Context context) {
-        super(EXTERNAL_NETWORK_INJECTION, sm, context);
+        super(CgmesNames.EXTERNAL_NETWORK_INJECTION, sm, context);
     }
 
     @Override
@@ -59,7 +58,7 @@ public void convert() {
     }
 
     private static void addSpecificProperties(Generator generator, PropertyBag p) {
-        generator.setProperty(Conversion.PROPERTY_CGMES_ORIGINAL_CLASS, EXTERNAL_NETWORK_INJECTION);
+        generator.setProperty(Conversion.PROPERTY_CGMES_ORIGINAL_CLASS, CgmesNames.EXTERNAL_NETWORK_INJECTION);
         double governorSCD = p.asDouble("governorSCD");
         if (!Double.isNaN(governorSCD)) {
             generator.setProperty(Conversion.PROPERTY_CGMES_GOVERNOR_SCD, String.valueOf(governorSCD));

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/GroundConversion.java

@@ -8,6 +8,7 @@
 package com.powsybl.cgmes.conversion.elements;
 
 import com.powsybl.cgmes.conversion.Context;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.iidm.network.*;
 import com.powsybl.triplestore.api.PropertyBag;
 
@@ -17,7 +18,7 @@
 public class GroundConversion extends AbstractConductingEquipmentConversion {
 
     public GroundConversion(PropertyBag ec, Context context) {
-        super("Ground", ec, context);
+        super(CgmesNames.GROUND, ec, context);
     }
 
     @Override

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/OperationalLimitConversion.java

@@ -9,6 +9,7 @@
 package com.powsybl.cgmes.conversion.elements;
 
 import com.powsybl.cgmes.conversion.Context;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.iidm.network.*;
 import com.powsybl.triplestore.api.PropertyBag;
 
@@ -32,7 +33,7 @@ public class OperationalLimitConversion extends AbstractIdentifiedObjectConversi
     private static final String TEMPORARY_LIMIT = "Temporary Limit";
 
     public OperationalLimitConversion(PropertyBag l, Context context) {
-        super("OperationalLimit", l, context);
+        super(CgmesNames.OPERATIONAL_LIMIT, l, context);
         String limitSubclass = p.getLocal(OPERATIONAL_LIMIT_SUBCLASS);
         // Limit can associated to a Terminal or to an Equipment
         terminalId = l.getId("Terminal");

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/ShuntConversion.java

@@ -28,7 +28,7 @@ public class ShuntConversion extends AbstractConductingEquipmentConversion {
     private static final String SECTION_NUMBER = "sectionNumber";
 
     public ShuntConversion(PropertyBag sh, Context context) {
-        super("ShuntCompensator", sh, context);
+        super(CgmesNames.SHUNT_COMPENSATOR, sh, context);
     }
 
     private int getSections(PropertyBag p, int normalSections) {

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/StaticVarCompensatorConversion.java

@@ -10,6 +10,7 @@
 
 import com.powsybl.cgmes.conversion.Context;
 import com.powsybl.cgmes.conversion.RegulatingControlMappingForStaticVarCompensators;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.iidm.network.StaticVarCompensator;
 import com.powsybl.iidm.network.StaticVarCompensatorAdder;
 import com.powsybl.iidm.network.extensions.VoltagePerReactivePowerControlAdder;
@@ -21,7 +22,7 @@
 public class StaticVarCompensatorConversion extends AbstractConductingEquipmentConversion {
 
     public StaticVarCompensatorConversion(PropertyBag svc, Context context) {
-        super("StaticVarCompensator", svc, context);
+        super(CgmesNames.STATIC_VAR_COMPENSATOR, svc, context);
     }
 
     @Override

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/SubstationConversion.java

@@ -11,6 +11,7 @@
 import com.powsybl.cgmes.conversion.Context;
 import com.powsybl.cgmes.conversion.Conversion;
 import com.powsybl.cgmes.conversion.CountryConversion;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.iidm.network.Country;
 import com.powsybl.iidm.network.Substation;
 import com.powsybl.iidm.network.SubstationAdder;
@@ -22,7 +23,7 @@
 public class SubstationConversion extends AbstractIdentifiedObjectConversion {
 
     public SubstationConversion(PropertyBag s, Context context) {
-        super("Substation", s, context);
+        super(CgmesNames.SUBSTATION, s, context);
     }
 
     @Override

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/SwitchConversion.java

@@ -9,6 +9,7 @@
 package com.powsybl.cgmes.conversion.elements;
 
 import com.powsybl.cgmes.conversion.Conversion;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.iidm.network.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,7 +28,7 @@ public class SwitchConversion extends AbstractConductingEquipmentConversion impl
     private DanglingLine danglingLine;
 
     public SwitchConversion(PropertyBag sw, Context context) {
-        super("Switch", sw, context, 2);
+        super(CgmesNames.SWITCH, sw, context, 2);
     }
 
     @Override

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/SynchronousMachineConversion.java

@@ -11,13 +11,13 @@
 import com.powsybl.cgmes.conversion.Context;
 import com.powsybl.cgmes.conversion.Conversion;
 import com.powsybl.cgmes.conversion.RegulatingControlMappingForGenerators;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.cgmes.model.PowerFlow;
 import com.powsybl.iidm.network.*;
 import com.powsybl.iidm.network.extensions.ActivePowerControlAdder;
 import com.powsybl.iidm.network.extensions.ReferencePriority;
 
 import com.powsybl.triplestore.api.PropertyBag;
-import static com.powsybl.cgmes.model.CgmesNames.SYNCHRONOUS_MACHINE;
 import java.util.Arrays;
 
 /**
@@ -28,7 +28,7 @@ public class SynchronousMachineConversion extends AbstractReactiveLimitsOwnerCon
     private final boolean isCondenser;
 
     public SynchronousMachineConversion(PropertyBag sm, Context context) {
-        super(SYNCHRONOUS_MACHINE, sm, context);
+        super(CgmesNames.SYNCHRONOUS_MACHINE, sm, context);
         String type = p.getLocal("type");
         isCondenser = type != null && type.endsWith("Kind.condenser");
     }
@@ -78,7 +78,7 @@ public void convert() {
     }
 
     private static void addSpecificProperties(Generator generator, PropertyBag p) {
-        generator.setProperty(Conversion.PROPERTY_CGMES_ORIGINAL_CLASS, SYNCHRONOUS_MACHINE);
+        generator.setProperty(Conversion.PROPERTY_CGMES_ORIGINAL_CLASS, CgmesNames.SYNCHRONOUS_MACHINE);
         String type = p.getLocal("type");
         if (type != null) {
             generator.setProperty(Conversion.PROPERTY_CGMES_SYNCHRONOUS_MACHINE_TYPE, type.replace("SynchronousMachineKind.", ""));

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/VoltageLevelConversion.java

@@ -10,6 +10,7 @@
 
 import com.powsybl.cgmes.conversion.Context;
 import com.powsybl.cgmes.model.CgmesModelException;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.iidm.network.Substation;
 import com.powsybl.iidm.network.TopologyKind;
 import com.powsybl.iidm.network.VoltageLevel;
@@ -20,8 +21,9 @@
  * @author Luma Zamarreño {@literal <zamarrenolm at aia.es>}
  */
 public class VoltageLevelConversion extends AbstractIdentifiedObjectConversion {
+
     public VoltageLevelConversion(PropertyBag vl, Context context) {
-        super("VoltageLevel", vl, context);
+        super(CgmesNames.VOLTAGE_LEVEL, vl, context);
         cgmesSubstationId = p.getId("Substation");
         iidmSubstationId = context.substationIdMapping().substationIidm(cgmesSubstationId);
         substation = context.network().getSubstation(iidmSubstationId);

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/hvdc/AcDcConverterConversion.java

@@ -14,6 +14,7 @@
 import com.powsybl.cgmes.conversion.Conversion;
 import com.powsybl.cgmes.conversion.RegulatingControlMappingForVscConverters;
 import com.powsybl.cgmes.conversion.elements.AbstractReactiveLimitsOwnerConversion;
+import com.powsybl.cgmes.model.CgmesNames;
 import com.powsybl.iidm.network.*;
 import com.powsybl.iidm.network.HvdcConverterStation.HvdcType;
 import com.powsybl.triplestore.api.PropertyBag;
@@ -28,7 +29,7 @@ public class AcDcConverterConversion extends AbstractReactiveLimitsOwnerConversi
     private static final double DEFAULT_POWER_FACTOR = 0.8;
 
     public AcDcConverterConversion(PropertyBag c, HvdcType converterType, double lossFactor, String acDcConverterDcTerminalId, Context context) {
-        super("ACDCConverter", c, context);
+        super(CgmesNames.ACDC_CONVERTER, c, context);
 
         this.converterType = Objects.requireNonNull(converterType);
         this.lossFactor = lossFactor;

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/hvdc/DcLineSegmentConversion.java

@@ -35,8 +35,8 @@ public class DcLineSegmentConversion extends AbstractIdentifiedObjectConversion
     }
 
     DcLineSegmentConversion(PropertyBag l, HvdcLine.ConvertersMode mode, double r, double ratedUdc,
-        DcLineSegmentConverter converter1, DcLineSegmentConverter converter2, boolean isDuplicated, Context context) {
-        super("DCLineSegment", l, context);
+                            DcLineSegmentConverter converter1, DcLineSegmentConverter converter2, boolean isDuplicated, Context context) {
+        super(CgmesNames.DC_LINE_SEGMENT, l, context);
 
         Objects.requireNonNull(converter1);
         Objects.requireNonNull(converter2);