Merge pull request #1514 from GRIDAPPSD/releases/2021.03.0

Release of version 2021.03.0

Author: poorva1209

.travis/build-docker.sh

@@ -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=$?

Dockerfile

@@ -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
 

cnf/ext/repositories.bnd

@@ -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

gov.pnnl.goss.gridappsd/bnd.bnd

@@ -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,\

gov.pnnl.goss.gridappsd/conf/pnnl.goss.gridappsd.cfg

@@ -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

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

@@ -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,\

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;
@@ -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.");