From b0cb32f929163cc2d684ab1490ca35402ba43eef Mon Sep 17 00:00:00 2001 From: poorva1209 Date: Thu, 17 Nov 2022 00:16:26 -0800 Subject: [PATCH 1/2] added api to return field_mrid --- .../gov/pnnl/goss/gridappsd/api/FieldBusManager.java | 2 ++ .../gridappsd/distributed/FieldBusManagerImpl.java | 9 --------- .../gov/pnnl/goss/gridappsd/dto/PlatformStatus.java | 5 +++++ .../pnnl/goss/gridappsd/dto/RequestPlatformStatus.java | 10 +++++++++- .../gov/pnnl/goss/gridappsd/dto/ServiceInstance.java | 2 +- .../gov/pnnl/goss/gridappsd/process/ProcessEvent.java | 2 ++ 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/api/FieldBusManager.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/api/FieldBusManager.java index 6d51989bf..b4a434ac2 100644 --- a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/api/FieldBusManager.java +++ b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/api/FieldBusManager.java @@ -5,5 +5,7 @@ public interface FieldBusManager { public Serializable handleRequest(String requestQueue, Serializable request); + + public String getFieldModelMrid(); } diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/distributed/FieldBusManagerImpl.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/distributed/FieldBusManagerImpl.java index 9eba9b6f3..e137def58 100644 --- a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/distributed/FieldBusManagerImpl.java +++ b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/distributed/FieldBusManagerImpl.java @@ -77,7 +77,6 @@ public class FieldBusManagerImpl implements FieldBusManager { Client client; - List feederList = null; Map> messageBus_measIds_map = new HashMap>(); Map measId_messageBus_map = new HashMap(); @@ -132,14 +131,6 @@ public Serializable handleRequest(String request_queue, Serializable request) { if (request_queue.endsWith("context")) { RequestFieldContext requestFieldContext = RequestFieldContext.parse(request.toString()); - // TODO: This block will be used if FieldBusManager is initialized - // with multiple feeders - /* - * for(Feeder feeder : feederList){ - * if(feeder.feeder_id.equals(requestFieldContext.modelId)) - * responseFeeder = feeder; } - */ - if (requestFieldContext.areaId == null) return topology.root.feeders; else { diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/PlatformStatus.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/PlatformStatus.java index 4643313fc..e77b0ee84 100644 --- a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/PlatformStatus.java +++ b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/PlatformStatus.java @@ -11,6 +11,7 @@ public class PlatformStatus implements Serializable{ List services; List appInstances; List serviceInstances; + String fieldModelMrid; public PlatformStatus() {} @@ -50,5 +51,9 @@ public List getServiceInstances() { public void setServiceInstances(List serviceInstances) { this.serviceInstances = serviceInstances; } + public void setField(String fieldModelMrid) { + this.fieldModelMrid = fieldModelMrid; + + } } diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/RequestPlatformStatus.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/RequestPlatformStatus.java index 55d68ea47..6a1e292f8 100644 --- a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/RequestPlatformStatus.java +++ b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/RequestPlatformStatus.java @@ -12,6 +12,7 @@ public class RequestPlatformStatus implements Serializable { boolean services = false; boolean appInstances = false; boolean serviceInstances = false; + boolean field = false; public boolean isApplications() { return applications; @@ -37,15 +38,22 @@ public boolean isServiceInstances() { public void setServiceInstances(boolean serviceInstances) { this.serviceInstances = serviceInstances; } + public boolean isField() { + return field; + } + public void setField(boolean field) { + this.field = field; + } public static RequestPlatformStatus parse(String jsonString){ Gson gson = new Gson(); RequestPlatformStatus obj = gson.fromJson(jsonString, RequestPlatformStatus.class); - if(!obj.appInstances & !obj.services & !obj.applications & !obj.serviceInstances){ + if(!obj.appInstances & !obj.services & !obj.applications & !obj.serviceInstances & !obj.field){ obj.applications = true; obj.services = true; obj.appInstances = true; obj.serviceInstances = true; + obj.field = true; } return obj; } diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/ServiceInstance.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/ServiceInstance.java index 4c8b018b2..8a5a9e2d4 100644 --- a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/ServiceInstance.java +++ b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/ServiceInstance.java @@ -52,7 +52,7 @@ public class ServiceInstance implements Serializable{ ServiceInfo servcie_info; HashMap runtime_options; String simulation_id; - Process process; + transient Process process; public ServiceInstance(String instance_id, ServiceInfo servcie_info, HashMap runtime_options, String simulation_id, Process process){ diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/process/ProcessEvent.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/process/ProcessEvent.java index c9a755425..0e6e8f1c5 100644 --- a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/process/ProcessEvent.java +++ b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/process/ProcessEvent.java @@ -347,6 +347,8 @@ else if(event.getDestination().contains(GridAppsDConstants.topic_requestPlatform platformStatus.setAppInstances(appManager.listRunningApps()); if(request.isServiceInstances()) platformStatus.setServiceInstances(serviceManager.listRunningServices()); + if(request.isField()) + platformStatus.setField(fieldBusManager.getFieldModelMrid()); client.publish(event.getReplyDestination(), platformStatus); } else if (event.getDestination().contains(GridAppsDConstants.topic_requestMyRoles)){ From 4836490a68d055289cab78781560ee711e3957be Mon Sep 17 00:00:00 2001 From: poorva1209 Date: Tue, 22 Nov 2022 01:58:01 -0800 Subject: [PATCH 2/2] addd tostring methods to switch and secondary areas for distributed api --- .../gov/pnnl/goss/gridappsd/dto/field/SecondaryArea.java | 8 ++++++++ .../src/gov/pnnl/goss/gridappsd/dto/field/SwitchArea.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/field/SecondaryArea.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/field/SecondaryArea.java index fdd69895b..83a334289 100644 --- a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/field/SecondaryArea.java +++ b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/field/SecondaryArea.java @@ -3,6 +3,8 @@ import java.io.Serializable; import java.util.ArrayList; +import com.google.gson.Gson; + public class SecondaryArea implements Serializable{ private static final long serialVersionUID = 1L; @@ -13,4 +15,10 @@ public class SecondaryArea implements Serializable{ public ArrayList connectivity_node; public String message_bus_id; + @Override + public String toString() { + Gson gson = new Gson(); + return gson.toJson(this); + } + } diff --git a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/field/SwitchArea.java b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/field/SwitchArea.java index 7f1ae3d00..016e08b36 100644 --- a/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/field/SwitchArea.java +++ b/gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/dto/field/SwitchArea.java @@ -3,6 +3,8 @@ import java.io.Serializable; import java.util.ArrayList; +import com.google.gson.Gson; + public class SwitchArea implements Serializable { private static final long serialVersionUID = 1L; @@ -13,5 +15,11 @@ public class SwitchArea implements Serializable { public ArrayList secondary_areas; public ArrayList connectivity_node; public String message_bus_id; + + @Override + public String toString() { + Gson gson = new Gson(); + return gson.toJson(this); + } }