From 6b079111df09823a4e0deaa90a10e4cbb98a519e Mon Sep 17 00:00:00 2001 From: tdtalbot <6729926+tdtalbot@users.noreply.github.com> Date: Thu, 13 Feb 2025 13:44:49 -0800 Subject: [PATCH] Fixes to work with the new seto models, updated service manager so that the output from the services is added to the gridappsd logs --- .../conf/pnnl.goss.gridappsd.cfg | 2 +- .../data/BGPowergridModelDataManagerImpl.java | 22 +++++++++---------- .../gridappsd/service/ServiceManagerImpl.java | 6 ++--- .../service/helics_goss_bridge.py | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gov.pnnl.goss.gridappsd/conf/pnnl.goss.gridappsd.cfg b/gov.pnnl.goss.gridappsd/conf/pnnl.goss.gridappsd.cfg index 529acf7e..b6443883 100644 --- a/gov.pnnl.goss.gridappsd/conf/pnnl.goss.gridappsd.cfg +++ b/gov.pnnl.goss.gridappsd/conf/pnnl.goss.gridappsd.cfg @@ -35,4 +35,4 @@ proven.advanced_query.path = http://proven:8080/hybrid/rest/v1/repository/getAdv # Power grid model MRID for deployed Field Bus -field.model.mrid = _49AD8E07-3BF9-A4E2-CB8F-C3722F837B62 +field.model.mrid = 49AD8E07-3BF9-A4E2-CB8F-C3722F837B62 diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/data/BGPowergridModelDataManagerImpl.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/data/BGPowergridModelDataManagerImpl.java index fc799b0f..8a3dea9b 100644 --- a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/data/BGPowergridModelDataManagerImpl.java +++ b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/data/BGPowergridModelDataManagerImpl.java @@ -148,9 +148,9 @@ public static void main(String[] args){ // System.out.println(bg.queryObjectTypes("_4F76A5F9-271D-9EB8-5E31-AA362D86F2C3", "JSON", "12345", "user")); System.out.println(bg.queryModelNameList("12345", "user")); long start = new Date().getTime(); - String model = bg.queryModel("_5B816B93-7A5F-B64C-8460-47C17D6E4B0F", "", "", "XML", "12345", "user"); -// String model = bg.queryModel("_4F76A5F9-271D-9EB8-5E31-AA362D86F2C3", "", "", "XML", "12345", "user"); -// String model = bg.queryModel("_503D6E20-F499-4CC7-8051-971E23D0BF79", "", "", "XML", "12345", "user"); + String model = bg.queryModel("5B816B93-7A5F-B64C-8460-47C17D6E4B0F", "", "", "XML", "12345", "user"); +// String model = bg.queryModel("4F76A5F9-271D-9EB8-5E31-AA362D86F2C3", "", "", "XML", "12345", "user"); +// String model = bg.queryModel("503D6E20-F499-4CC7-8051-971E23D0BF79", "", "", "XML", "12345", "user"); FileOutputStream fout = new FileOutputStream(new File("xml_new_full.xml")); @@ -163,23 +163,23 @@ public static void main(String[] args){ // System.out.println(bg.queryModelNames("XML")); // System.out.println(bg.queryModelNamesAndIds("XML", "12345", "user")); -// System.out.println(bg.queryObjectIds("JSON", "_4F76A5F9-271D-9EB8-5E31-AA362D86F2C3", "LoadBreakSwitch", "12345", "user")); +// System.out.println(bg.queryObjectIds("JSON", "4F76A5F9-271D-9EB8-5E31-AA362D86F2C3", "LoadBreakSwitch", "12345", "user")); //test with both object id and type -// System.out.println(bg.queryObjectDictByType("JSON", "_C1C3E687-6FFD-C753-582B-632A27E28507", "LinearShuntCompensator", "_EF2FF8C1-A6A6-4771-ADDD-A371AD929D5B", "12345", "user")); //ieee123 +// System.out.println(bg.queryObjectDictByType("JSON", "C1C3E687-6FFD-C753-582B-632A27E28507", "LinearShuntCompensator", "_EF2FF8C1-A6A6-4771-ADDD-A371AD929D5B", "12345", "user")); //ieee123 //test with only object id -// System.out.println(bg.queryObjectDictByType("JSON", "_C1C3E687-6FFD-C753-582B-632A27E28507", null, "_EF2FF8C1-A6A6-4771-ADDD-A371AD929D5B", "12345", "user")); //ieee123 +// System.out.println(bg.queryObjectDictByType("JSON", "C1C3E687-6FFD-C753-582B-632A27E28507", null, "_EF2FF8C1-A6A6-4771-ADDD-A371AD929D5B", "12345", "user")); //ieee123 //test with only object type -// System.out.println(bg.queryObjectDictByType("JSON", "_C1C3E687-6FFD-C753-582B-632A27E28507", "LinearShuntCompensator", null, "12345", "user")); //ieee123 +// System.out.println(bg.queryObjectDictByType("JSON", "C1C3E687-6FFD-C753-582B-632A27E28507", "LinearShuntCompensator", null, "12345", "user")); //ieee123 //test with neither object or type, should fail // try{ -// System.out.println(bg.queryObjectDictByType("JSON", "_C1C3E687-6FFD-C753-582B-632A27E28507", null, null, "12345", "user")); //ieee123 +// System.out.println(bg.queryObjectDictByType("JSON", "C1C3E687-6FFD-C753-582B-632A27E28507", null, null, "12345", "user")); //ieee123 // }catch (Exception e) { // System.out.println("Expected error "+e.getMessage()); // // TODO: handle exception // } - // System.out.println(bg.queryObjectDictByType("JSON", "_4F76A5F9-271D-9EB8-5E31-AA362D86F2C3", "LinearShuntCompensator", null, "12345", "user")); //ieee8500 -// System.out.println(bg.queryMeasurementDictByObject("JSON", "_4F76A5F9-271D-9EB8-5E31-AA362D86F2C3", null, "_7A02B3B0-2746-EB24-45A5-C3FBA8ACB88E", "12345", "user")); -// System.out.println(bg.queryMeasurementDictByObject("JSON", "_4F76A5F9-271D-9EB8-5E31-AA362D86F2C3", "LinearShuntCompensator", null, "12345", "user")); + // System.out.println(bg.queryObjectDictByType("JSON", "4F76A5F9-271D-9EB8-5E31-AA362D86F2C3", "LinearShuntCompensator", null, "12345", "user")); //ieee8500 +// System.out.println(bg.queryMeasurementDictByObject("JSON", "4F76A5F9-271D-9EB8-5E31-AA362D86F2C3", null, "_7A02B3B0-2746-EB24-45A5-C3FBA8ACB88E", "12345", "user")); +// System.out.println(bg.queryMeasurementDictByObject("JSON", "4F76A5F9-271D-9EB8-5E31-AA362D86F2C3", "LinearShuntCompensator", null, "12345", "user")); // System.out.println } catch (Exception e) { diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/service/ServiceManagerImpl.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/service/ServiceManagerImpl.java index 16cd1205..2c2fcb60 100755 --- a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/service/ServiceManagerImpl.java +++ b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/service/ServiceManagerImpl.java @@ -338,7 +338,7 @@ public String startServiceForSimultion(String serviceId, HashMap if(serviceDirectory.exists()) processServiceBuilder.directory(serviceDirectory); processServiceBuilder.redirectErrorStream(true); - processServiceBuilder.redirectOutput(); + processServiceBuilder.redirectOutput(ProcessBuilder.Redirect.INHERIT); logManager.info(ProcessStatus.RUNNING, simulationId, "Starting service with command "+ String.join(" ",commands)); process = processServiceBuilder.start(); @@ -350,7 +350,7 @@ public String startServiceForSimultion(String serviceId, HashMap if(serviceDirectory.exists()) processServiceBuilder.directory(serviceDirectory); processServiceBuilder.redirectErrorStream(true); - processServiceBuilder.redirectOutput(); + processServiceBuilder.redirectOutput(ProcessBuilder.Redirect.INHERIT); logManager.info(ProcessStatus.RUNNING, simulationId, "Starting service with command "+ String.join(" ",commands)); process = processServiceBuilder.start(); @@ -361,7 +361,7 @@ public String startServiceForSimultion(String serviceId, HashMap if(serviceDirectory.exists()) processServiceBuilder.directory(serviceDirectory); processServiceBuilder.redirectErrorStream(true); - processServiceBuilder.redirectOutput(); + processServiceBuilder.redirectOutput(ProcessBuilder.Redirect.INHERIT); logManager.info(ProcessStatus.RUNNING, simulationId, "Starting service with command "+ String.join(" ",commands)); process = processServiceBuilder.start(); diff --git a/services/helicsgossbridge/service/helics_goss_bridge.py b/services/helicsgossbridge/service/helics_goss_bridge.py index 3af1f645..155ce083 100644 --- a/services/helicsgossbridge/service/helics_goss_bridge.py +++ b/services/helicsgossbridge/service/helics_goss_bridge.py @@ -1431,9 +1431,9 @@ def _create_cim_object_map(self,map_file=None): "prefix" : "cap_" } for y in regulators: - object_mrids = y.get("mRID",[]) + object_mrids = y.get("mRIDs",[]) object_name = y.get("bankName") - object_phases = y.get("endPhase",[]) + object_phases = y.get("endPhases",[]) for z in range(len(object_mrids)): self._object_mrid_to_name[object_mrids[z]] = { "name" : object_name,