Skip to content

Commit

Permalink
Merge pull request #1514 from GRIDAPPSD/releases/2021.03.0
Browse files Browse the repository at this point in the history
Release of version 2021.03.0
  • Loading branch information
poorva1209 authored Apr 19, 2021
2 parents 8c6691f + 4fce7d9 commit a2064a2
Show file tree
Hide file tree
Showing 21 changed files with 102 additions and 67 deletions.
13 changes: 13 additions & 0 deletions .travis/build-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,19 @@ GITHASH=`git log -1 --pretty=format:"%h"`
BUILD_VERSION="${TIMESTAMP}_${GITHASH}${TRAVIS_BRANCH:+:$TRAVIS_BRANCH}"
echo "BUILD_VERSION $BUILD_VERSION"

if [ -n "$DOCKER_USERNAME" -a -n "$DOCKER_PASSWORD" ]; then

echo " "
echo "Connecting to docker"

echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
status=$?
if [ $status -ne 0 ]; then
echo "Error: status $status"
exit 1
fi
fi

# Pass gridappsd tag to docker-compose
docker build --build-arg TIMESTAMP="${BUILD_VERSION}" -t ${IMAGE}:${TIMESTAMP}_${GITHASH} .
status=$?
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ARG TIMESTAMP
RUN cd ${TEMP_DIR} \
&& git clone https://github.com/GRIDAPPSD/gridappsd-python -b develop \
&& cd gridappsd-python \
&& pip3 install -r requirements.txt \
&& pip3 install . \
&& rm -rf /root/.cache/pip/wheels

Expand Down
2 changes: 1 addition & 1 deletion cnf/ext/repositories.bnd
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
-plugin: \
aQute.bnd.deployer.repository.FixedIndexedRepo;name=GOSS Core;locations=https://raw.githubusercontent.com/GridOptics/GOSS/master/cnf/releaserepo/index.xml,\
aQute.bnd.deployer.repository.FixedIndexedRepo; name=GOSS Dependencies; locations=https://github.com/GridOptics/GOSS-Repository/raw/master/dependencies/index.xml.gz,\
aQute.bnd.deployer.repository.FixedIndexedRepo;name=CIM to GLM;locations=https://raw.githubusercontent.com/GRIDAPPSD/Powergrid-Models/develop/cnf/release/index.xml,\
aQute.bnd.deployer.repository.FixedIndexedRepo;name=CIMHub;locations=https://raw.githubusercontent.com/GRIDAPPSD/CIMHub/master/cnf/release/index.xml,\
aQute.bnd.deployer.repository.LocalIndexedRepo;name=Local;local=${workspace}/cnf/Local;pretty=true,\
aQute.bnd.deployer.repository.FixedIndexedRepo;name=BND Hub;locations=https://raw.githubusercontent.com/bndtools/bundle-hub/master/index.xml.gz,\
aQute.lib.deployer.FileRepo;name=Build;location=${workspace}/cnf/buildrepo;latest=false
Expand Down
2 changes: 1 addition & 1 deletion gov.pnnl.goss.gridappsd/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
osgi.enroute.base.api,\
org.mockito.mockito-all,\
httpcore,\
blazegraph.cim2glm;version=19.1.1,\
cimhub.lib;version=0.2.4,\
httpclient,\
com.bigdata.rdf,\
proven-client;version=0.3,\
Expand Down
2 changes: 1 addition & 1 deletion gov.pnnl.goss.gridappsd/conf/pnnl.goss.gridappsd.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ fncs.bridge.path = ./scripts/goss_fncs_bridge.py
applications.path = /gridappsd/applications
services.path = /gridappsd/services
# Requires no /
blazegraph.ns.path = http://localhost:8889/bigdata/sparql
blazegraph.ns.path = http://localhost:8889/bigdata/namespace/kb/sparql

# Uses docker composed blazegraph host here. Note this is not the
# external address, but from inside one of the containers on the
Expand Down
2 changes: 1 addition & 1 deletion gov.pnnl.goss.gridappsd/run.bnd.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
httpcore,\
httpclient,\
xml-apis,\
blazegraph.cim2glm;version=19.1.1,\
cimhub.lib;version=0.2.4,\
org.eclipse.jetty.aggregate.jetty-all-server;version=7.6.9,\
com.bigdata.rdf,\
proven-message;version=0.4,\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@

import com.google.gson.Gson;

import gov.pnnl.goss.cim2glm.CIMImporter;
import gov.pnnl.goss.cim2glm.dto.ModelState;
import gov.pnnl.goss.cim2glm.queryhandler.QueryHandler;
import gov.pnnl.gridappsd.cimhub.CIMImporter;
import gov.pnnl.gridappsd.cimhub.dto.ModelState;
import gov.pnnl.gridappsd.cimhub.queryhandler.QueryHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationManager;
import gov.pnnl.goss.gridappsd.api.DataManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import gov.pnnl.goss.cim2glm.CIMImporter;
import gov.pnnl.goss.cim2glm.queryhandler.QueryHandler;
import gov.pnnl.gridappsd.cimhub.CIMImporter;
import gov.pnnl.gridappsd.cimhub.queryhandler.QueryHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationManager;
import gov.pnnl.goss.gridappsd.api.DataManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import gov.pnnl.goss.cim2glm.CIMImporter;
import gov.pnnl.goss.cim2glm.queryhandler.QueryHandler;
import gov.pnnl.gridappsd.cimhub.CIMImporter;
import gov.pnnl.gridappsd.cimhub.queryhandler.QueryHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationManager;
import gov.pnnl.goss.gridappsd.api.DataManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@
******************************************************************************/
package gov.pnnl.goss.gridappsd.configuration;

import gov.pnnl.goss.cim2glm.CIMImporter;
import gov.pnnl.goss.cim2glm.dto.ModelState;
import gov.pnnl.goss.cim2glm.queryhandler.QueryHandler;
import gov.pnnl.gridappsd.cimhub.CIMImporter;
import gov.pnnl.gridappsd.cimhub.CIMQuerySetter;
import gov.pnnl.gridappsd.cimhub.dto.ModelState;
import gov.pnnl.gridappsd.cimhub.queryhandler.QueryHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationManager;
import gov.pnnl.goss.gridappsd.api.DataManager;
Expand Down Expand Up @@ -227,9 +228,10 @@ public void generateConfig(Properties parameters, PrintWriter out, String proces

//TODO add climate

//CIM2GLM utility uses
//cimhub utility uses
CIMImporter cimImporter = new CIMImporter();
cimImporter.start(queryHandler, CONFIGTARGET, fRoot, scheduleName, loadScale, bWantSched, bWantZip, bWantRandomFractions, useHouses, zFraction, iFraction, pFraction, bHaveEventGen, modelState, false);
CIMQuerySetter qs = new CIMQuerySetter();
cimImporter.start(queryHandler, qs, CONFIGTARGET, fRoot, scheduleName, loadScale, bWantSched, bWantZip, bWantRandomFractions, useHouses, zFraction, iFraction, pFraction, bHaveEventGen, modelState, false);

logManager.info(ProcessStatus.RUNNING, processId, "Finished generating all DSS configuration files.");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import gov.pnnl.goss.cim2glm.CIMImporter;
import gov.pnnl.goss.cim2glm.queryhandler.QueryHandler;
import gov.pnnl.gridappsd.cimhub.CIMImporter;
import gov.pnnl.gridappsd.cimhub.queryhandler.QueryHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationManager;
import gov.pnnl.goss.gridappsd.api.LogManager;
Expand Down Expand Up @@ -81,11 +81,11 @@ public class DSSBaseConfigurationHandler extends BaseConfigurationHandler implem
@ServiceDependency
private volatile LogManager logManager;

public static final String CIM2GLM_PREFIX = "model";
public static final String DSSBASE_FILENAME = CIM2GLM_PREFIX+"_base.dss";
public static final String DSSBUSXY_FILENAME = CIM2GLM_PREFIX+"_busxy.ds";
public static final String DSSGUID_FILENAME = CIM2GLM_PREFIX+"_guid.ds";
public static final String DSSDICTIONARY_FILENAME = CIM2GLM_PREFIX+"_dict.json";
public static final String cimhub_PREFIX = "model";
public static final String DSSBASE_FILENAME = cimhub_PREFIX+"_base.dss";
public static final String DSSBUSXY_FILENAME = cimhub_PREFIX+"_busxy.ds";
public static final String DSSGUID_FILENAME = cimhub_PREFIX+"_guid.ds";
public static final String DSSDICTIONARY_FILENAME = cimhub_PREFIX+"_dict.json";


public static final String TYPENAME = "DSS Base";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import gov.pnnl.goss.cim2glm.CIMImporter;
import gov.pnnl.goss.cim2glm.queryhandler.QueryHandler;
import gov.pnnl.gridappsd.cimhub.CIMImporter;
import gov.pnnl.gridappsd.cimhub.queryhandler.QueryHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationManager;
import gov.pnnl.goss.gridappsd.api.DataManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@
import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;

import gov.pnnl.goss.cim2glm.CIMImporter;
import gov.pnnl.goss.cim2glm.dto.ModelState;
import gov.pnnl.goss.cim2glm.queryhandler.QueryHandler;
import gov.pnnl.gridappsd.cimhub.CIMImporter;
import gov.pnnl.gridappsd.cimhub.CIMQuerySetter;
import gov.pnnl.gridappsd.cimhub.dto.ModelState;
import gov.pnnl.gridappsd.cimhub.queryhandler.QueryHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationManager;
import gov.pnnl.goss.gridappsd.api.DataManager;
Expand Down Expand Up @@ -121,13 +122,13 @@ public class GLDAllConfigurationHandler extends BaseConfigurationHandler impleme
// public static final String CONFIGTARGET = "glm";
public static final String CONFIGTARGET = "both"; //will build files for both glm and dss

public static final String CIM2GLM_PREFIX = "model";
public static final String BASE_FILENAME = CIM2GLM_PREFIX+"_base.glm";
public static final String STARTUP_FILENAME = CIM2GLM_PREFIX+"_startup.glm";
public static final String SCHEDULES_FILENAME = CIM2GLM_PREFIX+"_schedules.glm";
public static final String MEASUREMENTOUTPUTS_FILENAME = CIM2GLM_PREFIX+"_outputs.json";
public static final String DICTIONARY_FILENAME = CIM2GLM_PREFIX+"_dict.json";
public static final String WEATHER_FILENAME = CIM2GLM_PREFIX+"_weather.csv";
public static final String cimhub_PREFIX = "model";
public static final String BASE_FILENAME = cimhub_PREFIX+"_base.glm";
public static final String STARTUP_FILENAME = cimhub_PREFIX+"_startup.glm";
public static final String SCHEDULES_FILENAME = cimhub_PREFIX+"_schedules.glm";
public static final String MEASUREMENTOUTPUTS_FILENAME = cimhub_PREFIX+"_outputs.json";
public static final String DICTIONARY_FILENAME = cimhub_PREFIX+"_dict.json";
public static final String WEATHER_FILENAME = cimhub_PREFIX+"_weather.csv";

final double sqrt3 = Math.sqrt(3);

Expand Down Expand Up @@ -234,17 +235,18 @@ public void generateConfig(Properties parameters, PrintWriter out, String proces
if(!dir.exists()){
dir.mkdirs();
}
String fRoot = dir.getAbsolutePath()+File.separator+CIM2GLM_PREFIX;
String fRoot = dir.getAbsolutePath()+File.separator+cimhub_PREFIX;

boolean useHouses = GridAppsDConstants.getBooleanProperty(parameters, USEHOUSES, false);
//TODO
boolean useClimate = true;//GridAppsDConstants.getBooleanProperty(parameters, USECLIMATE, false);

boolean bHaveEventGen = true;

//CIM2GLM utility uses
//cimhub utility uses
CIMImporter cimImporter = new CIMImporter();
cimImporter.start(queryHandler, CONFIGTARGET, fRoot, scheduleName, loadScale, bWantSched, bWantZip, bWantRandomFractions, useHouses, zFraction, iFraction, pFraction, bHaveEventGen, modelState, false);
CIMQuerySetter qs = new CIMQuerySetter();
cimImporter.start(queryHandler, qs, CONFIGTARGET, fRoot, scheduleName, loadScale, bWantSched, bWantZip, bWantRandomFractions, useHouses, zFraction, iFraction, pFraction, bHaveEventGen, modelState, false);
String tempDataPath = dir.getAbsolutePath();

//If use climate, then generate gridlabd weather data file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import gov.pnnl.goss.cim2glm.CIMImporter;
import gov.pnnl.goss.cim2glm.queryhandler.QueryHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationManager;
import gov.pnnl.goss.gridappsd.api.DataManager;
import gov.pnnl.goss.gridappsd.api.LogManager;
import gov.pnnl.goss.gridappsd.api.PowergridModelDataManager;
import gov.pnnl.goss.gridappsd.api.SimulationManager;
import gov.pnnl.goss.gridappsd.data.handlers.BlazegraphQueryHandler;
import gov.pnnl.goss.gridappsd.dto.LogMessage.LogLevel;
import gov.pnnl.goss.gridappsd.dto.LogMessage.ProcessStatus;
import gov.pnnl.goss.gridappsd.dto.SimulationContext;
import gov.pnnl.goss.gridappsd.utils.GridAppsDConstants;
import gov.pnnl.gridappsd.cimhub.CIMImporter;
import gov.pnnl.gridappsd.cimhub.CIMQuerySetter;
import gov.pnnl.gridappsd.cimhub.queryhandler.QueryHandler;
import pnnl.goss.core.Client;


Expand Down Expand Up @@ -181,12 +181,13 @@ public void generateConfig(Properties parameters, PrintWriter out, String proces
boolean bHaveEventGen = true;

CIMImporter cimImporter = new CIMImporter();
CIMQuerySetter qs = new CIMQuerySetter();

//If the simulation info is available also write to file
if(configFile!=null){
cimImporter.generateGLMFile(queryHandler, new PrintWriter(new FileWriter(configFile)), scheduleName, loadScale, bWantSched, bWantZip, bWantRandomFractions, useHouses, zFraction, iFraction, pFraction, bHaveEventGen);
cimImporter.generateGLMFile(queryHandler, qs, new PrintWriter(new FileWriter(configFile)), scheduleName, loadScale, bWantSched, bWantZip, bWantRandomFractions, useHouses, zFraction, iFraction, pFraction, bHaveEventGen);
} else {
cimImporter.generateGLMFile(queryHandler, out, scheduleName, loadScale, bWantSched, bWantZip, bWantRandomFractions, useHouses,zFraction, iFraction, pFraction, bHaveEventGen);
cimImporter.generateGLMFile(queryHandler, qs, out, scheduleName, loadScale, bWantSched, bWantZip, bWantRandomFractions, useHouses,zFraction, iFraction, pFraction, bHaveEventGen);
}
if(configFile!=null){
//config was written to file, so return that
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import gov.pnnl.goss.cim2glm.CIMImporter;
import gov.pnnl.goss.cim2glm.OperationalLimits;
import gov.pnnl.goss.cim2glm.queryhandler.QueryHandler;
import gov.pnnl.gridappsd.cimhub.CIMImporter;
import gov.pnnl.gridappsd.cimhub.OperationalLimits;
import gov.pnnl.gridappsd.cimhub.queryhandler.QueryHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationManager;
import gov.pnnl.goss.gridappsd.api.DataManager;
Expand Down Expand Up @@ -88,8 +88,8 @@ public class GLDLimitsConfigurationHandler extends BaseConfigurationHandler impl
public static final String RANDOMIZEFRACTIONS = "randomize_zipload_fractions";
public static final String MODELID = "model_id";
public static final String SIMULATIONID = "simulation_id";
public static final String CIM2GLM_PREFIX = "model";
public static final String LIMITS_FILENAME = CIM2GLM_PREFIX+"_limits.json";
public static final String cimhub_PREFIX = "model";
public static final String LIMITS_FILENAME = cimhub_PREFIX+"_limits.json";

public GLDLimitsConfigurationHandler() {
}
Expand Down Expand Up @@ -150,7 +150,7 @@ public void generateConfig(Properties parameters, PrintWriter out, String proces
QueryHandler queryHandler = new BlazegraphQueryHandler(bgHost, logManager, processId, username);
queryHandler.addFeederSelection(modelId);

//CIM2GLM utility uses
//cimhub utility uses
CIMImporter cimImporter = new CIMImporter();

OperationalLimits oLimits = new OperationalLimits();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@
import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;

import gov.pnnl.goss.cim2glm.CIMImporter;
import gov.pnnl.goss.cim2glm.dto.ModelState;
import gov.pnnl.goss.cim2glm.queryhandler.QueryHandler;
import gov.pnnl.gridappsd.cimhub.CIMImporter;
import gov.pnnl.gridappsd.cimhub.dto.ModelState;
import gov.pnnl.gridappsd.cimhub.queryhandler.QueryHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationManager;
import gov.pnnl.goss.gridappsd.api.LogManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public class GLDZiploadScheduleConfigurationHandler extends
public static final String ENDTIME_FILTER = "endTime";
public static final int TIMEFILTER_YEAR = 2018;

public static final String CIM2GLM_PREFIX = "model";
public static final String cimhub_PREFIX = "model";

final double sqrt3 = Math.sqrt(3);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import org.apache.jena.query.ResultSet;
import org.apache.jena.query.ResultSetCloseable;

import gov.pnnl.goss.cim2glm.queryhandler.QueryHandler;
import gov.pnnl.gridappsd.cimhub.queryhandler.QueryHandler;
import gov.pnnl.goss.gridappsd.api.LogManager;
import gov.pnnl.goss.gridappsd.dto.LogMessage.LogLevel;
import gov.pnnl.goss.gridappsd.dto.LogMessage.ProcessStatus;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;

import gov.pnnl.goss.cim2glm.dto.ModelState;
import gov.pnnl.gridappsd.cimhub.dto.ModelState;

public class ModelCreationConfig implements Serializable{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.apache.jena.query.QuerySolution;
import org.apache.jena.query.ResultSet;

import gov.pnnl.goss.cim2glm.queryhandler.QueryHandler;
import gov.pnnl.gridappsd.cimhub.queryhandler.QueryHandler;
import gov.pnnl.goss.gridappsd.api.ConfigurationManager;
import gov.pnnl.goss.gridappsd.data.handlers.BlazegraphQueryHandler;

Expand Down
Loading

0 comments on commit a2064a2

Please sign in to comment.