Merge pull request #994 from GRIDAPPSD/develop

Update 2019.06.beta release

gov.pnnl.goss.gridappsd/bnd.bnd

@@ -32,8 +32,8 @@
 	blazegraph.cim2glm;version=10.0.3,\
 	httpclient,\
 	com.bigdata.rdf,\
-    proven-client;version=0.2.1,\
-    proven-message;version=0.3
+    proven-client;version=0.2.2,\
+    proven-message;version=0.4
 
 -plugin org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug
 

gov.pnnl.goss.gridappsd/run.bnd.bndrun

@@ -78,8 +78,8 @@
 	org.eclipse.jetty.aggregate.jetty-all-server;version=7.6.9,\
 	javax.servlet-api,\
 	com.bigdata.rdf,\
-	proven-message;version=0.3,\
-	proven-client;version=0.2.1,\
+	proven-message;version=0.4,\
+	proven-client;version=0.2.2,\
 	javax.ws.rs-api,\
 	org.apache.commons.codec,\
 	shacl,\

gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/api/AppManager.java

@@ -94,6 +94,13 @@ public interface AppManager {
 	 */
 	AppInfo getApp(String appId); //Would return through message bus appInfo object
 
+	/**
+	 * Returns application id for the application instance id.
+	 * @param appInstanceId Instance id of the application
+	 * @return Application id
+	 */
+	String getAppIdForInstance(String appInstanceId);
+
 	/**
 	 * Unregisters app with the requested id
 	 * @param appId Registered ID of the app to de-register

gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/api/PowergridModelDataManager.java

@@ -27,6 +27,16 @@ public enum ResultFormat {
 	String queryModelNamesAndIds(String resultFormat, String processId, String username);
 	ResultSet queryModelNamesAndIdsResultSet(String processId, String username);
 
+	String queryObjectIds(String resultFormat, String modelId, String objectType, String processId, String username);
+	List<String> queryObjectIdsList(String modelId, String objectType, String processId, String username);
+
+	String queryObjectDictByType(String resultFormat, String modelId, String objectType, String objectId, String processId, String username) throws Exception ;
+	ResultSet queryObjectDictByTypeResultSet(String modelId, String objectType, String objectId, String processId, String username);
+
+	String queryMeasurementDictByObject(String resultFormat, String modelId, String objectId, String processId, String username) throws Exception ;
+	ResultSet queryMeasurementDictByObjectResultSet(String modelId, String objectId, String processId, String username);
+
+
 	void putModel(String modelId, String model, String inputFormat, String processId, String username);
 
 	//Also will need putObject and deleteObject  (will need to support the right security permissions)

gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/api/ServiceManager.java

@@ -71,6 +71,13 @@ public interface ServiceManager {
 	 */
 	ServiceInfo getService(String service_id); //Would return through message bus appInfo object
 
+	/**
+	 * Returns service id for a service instance id. 
+	 * @param serviceInstanceId Instance id of a running or ran service
+	 * @return Service Id for the passed instance id.
+	 */
+	String getServiceIdForInstance(String serviceInstanceId);
+
 	/**
 	 * Unregisters service with the requested id
 	 * @param service_id  Registered ID of the service to de-register

gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/api/TimeseriesDataManager.java

@@ -3,6 +3,7 @@
 import java.io.Serializable;
 
 import gov.pnnl.goss.gridappsd.dto.RequestTimeseriesData;
+import gov.pnnl.goss.gridappsd.dto.SimulationContext;
 
 public interface TimeseriesDataManager {
 //	public enum ResultFormat {
@@ -11,8 +12,22 @@ public interface TimeseriesDataManager {
 
 	Serializable query(RequestTimeseriesData requestTimeseriesData) throws Exception;
 
-	void storeSimulationOutput(Serializable simulationOutput) throws Exception;
+	void storeSimulationOutput(String simulationId) throws Exception;
 
-	void storeSimulationInput(Serializable simulationIput) throws Exception;
+	void storeSimulationInput(String simulationId) throws Exception;
+
+	void storeServiceOutput(String simulationId, String serviceId,
+			String instanceId) throws Exception;
+
+	void storeServiceInput(String simulationId, String serviceId,
+			String instanceId) throws Exception;
+
+	void storeAppOutput(String simulationId, String appId, String instanceId)
+			throws Exception;
+
+	void storeAppInput(String simulationId, String appId, String instanceId)
+			throws Exception;
+
+	void storeAllData(SimulationContext simulationContext) throws Exception;
 
 }

gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/app/AppManagerImpl.java

@@ -413,6 +413,12 @@ public AppInfo getApp(String appId) {
 		appId = appId.trim();
 		return apps.get(appId);
 	}
+
+	@Override
+	public String getAppIdForInstance(String appInstanceId) {
+		appInstanceId = appInstanceId.trim();
+		return appInstances.get(appInstanceId).getApp_info().getId();
+	}
 
 	@Override
 	public void deRegisterApp(String appId) {

gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/GLDAllConfigurationHandler.java

@@ -72,7 +72,6 @@
 import gov.pnnl.goss.gridappsd.data.handlers.BlazegraphQueryHandler;
 import gov.pnnl.goss.gridappsd.dto.RequestTimeseriesData;
 import gov.pnnl.goss.gridappsd.dto.LogMessage.LogLevel;
-import gov.pnnl.goss.gridappsd.dto.RequestTimeseriesData.RequestType;
 import gov.pnnl.goss.gridappsd.utils.GridAppsDConstants;
 import pnnl.goss.core.Client;
 import pnnl.goss.core.DataResponse;
@@ -242,7 +241,7 @@ public void generateConfig(Properties parameters, PrintWriter out, String proces
 		try {
 			if(useClimate){
 				RequestTimeseriesData weatherRequest = new RequestTimeseriesData();
-				weatherRequest.setQueryMeasurement(RequestType.weather);
+				weatherRequest.setQueryMeasurement("weather");
 				weatherRequest.setResponseFormat(ProvenWeatherToGridlabdWeatherConverter.OUTPUT_FORMAT);
 				Map<String, String> queryFilter = new HashMap<String, String>();
 
@@ -393,7 +392,9 @@ protected void generateStartupFile(Properties parameters, String tempDataPath, P
 				if(useClimate) {
 					startupFileWriter.println("module climate;");
 				}
+				startupFileWriter.println("module reliability;");
 
+
 				startupFileWriter.println("object fncs_msg {");
 				startupFileWriter.println("     name "+simulationID+";");
 				startupFileWriter.println("     message_type JSON;");
@@ -414,6 +415,17 @@ protected void generateStartupFile(Properties parameters, String tempDataPath, P
 				startupFileWriter.println("         limit 120;");
 				startupFileWriter.println("}");*/
 
+				startupFileWriter.println("object fault_check {");
+				startupFileWriter.println("     name fault_check_object;");
+				startupFileWriter.println("     check_mode ONCHANGE;");
+				startupFileWriter.println("     eventgen_object external_event_handler;");
+				startupFileWriter.println("     output_filename fault_check_output.txt;");
+				startupFileWriter.println("}");
+				startupFileWriter.println("object eventgen {");
+				startupFileWriter.println("     name external_event_handler;");
+				startupFileWriter.println("     use_external_faults TRUE;");
+				startupFileWriter.println("}");
+
 				if(useClimate) {
 					startupFileWriter.println("object csv_reader {");
 					startupFileWriter.println(" name CSVREADER;");

gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/configuration/GLDSimulationOutputConfigurationHandler.java

@@ -310,12 +310,6 @@ void parseMeasurement(Map<String, JsonArray> measurements, JsonObject measuremen
 			} else if (measurementType.equals("Pos")) {
 				objectName = conductingEquipmentName;
 				propertyName = "tap_" + phases;
-			} else if (measurementType.equals("PNV")) {
-				objectName = connectivityNode;
-				propertyName = "voltage_"+phases;
-			} else if (measurementType.equals("A")) {
-				objectName = conductingEquipmentName;
-				propertyName = "current_out_" + phases;
 			} else {
 				throw new JsonParseException(String.format("CimMeasurementsToGldPubs::parseMeasurement: The value of measurementType is not a valid type.\nValid types for RatioTapChanger are VA, PNV, A, and Pos.\nmeasurementType = %s.",measurementType));
 			}

gov.pnnl.goss.gridappsd/src/gov/pnnl/goss/gridappsd/data/BGPowergridModelDataManagerHandlerImpl.java

@@ -55,7 +55,22 @@ public Serializable handle(Serializable requestContent, String processId, String
 				//TODO send error
 			}
 			return dataManager.queryObjectTypes(pgDataRequest.getModelId(), pgDataRequest.getResultFormat(), processId, username);
-		} else {
+		} else if(PowergridModelDataRequest.RequestType.QUERY_OBJECT_IDS.toString().equals(pgDataRequest.requestType)){
+			if (pgDataRequest.getModelId()==null || !verifyResultFormat(pgDataRequest.getResultFormat())){
+				//TODO send error
+			}
+			return dataManager.queryObjectIds(pgDataRequest.getResultFormat(), pgDataRequest.getModelId(), pgDataRequest.getObjectType(), processId, username);
+		} else if(PowergridModelDataRequest.RequestType.QUERY_OBJECT_DICT.toString().equals(pgDataRequest.requestType)){
+			if (pgDataRequest.getModelId()==null || !verifyResultFormat(pgDataRequest.getResultFormat())){
+				//TODO send error
+			}
+			return dataManager.queryObjectDictByType(pgDataRequest.getResultFormat(), pgDataRequest.getModelId(), pgDataRequest.getObjectType(), pgDataRequest.getObjectId(), processId, username);
+		} else if(PowergridModelDataRequest.RequestType.QUERY_OBJECT_MEASUREMENTS.toString().equals(pgDataRequest.requestType)){
+			if (pgDataRequest.getModelId()==null || !verifyResultFormat(pgDataRequest.getResultFormat())){
+				//TODO send error
+			}
+			return dataManager.queryMeasurementDictByObject(pgDataRequest.getResultFormat(), pgDataRequest.getModelId(), pgDataRequest.getObjectId(), processId, username);
+		}  else {
 			//TODO report error, request type not recognized
 			System.out.println("DOESNT RECOGNIZE REQUEST TYPE "+pgDataRequest.requestType);
 		}