Move eservice database creation & update to site.psh.

A small change to the the eservice command to load the
datatbase makes it possible to create and update the
eservice database directly from the site.psh script.
This should simplify creating the database. Note that
the site.psh is set up for the current standard test
environment. It should be customized with any site-specific
changes.

Signed-off-by: Mic Bowman <[email protected]>

Author: cmickeyb

build/opt/pdo/etc/template/site.psh

@@ -19,8 +19,24 @@ if --null "${data}"
    exit
 fi
 
-set -q --conditional -s dbfile -v ${data}/eservice-db.json
-eservice_db load --database ${dbfile}
+## load the local database if it exists
+set -q --conditional -s dbfile --state Service EnclaveServiceDatabaseFile
+
+## this returns false of the database file does not exist
+## we can use this later to save the updates
+eservice_db load --database ${dbfile} -s _database_exists_
+
+## make sure the minimal set of enclave services is included
+eservice_db add --url http://localhost:7101 --name es7101
+eservice_db add --url http://localhost:7102 --name es7102
+eservice_db add --url http://localhost:7103 --name es7103
+eservice_db add --url http://localhost:7104 --name es7104
+eservice_db add --url http://localhost:7105 --name es7105
+
+if -e ${_database_exists_} False
+   eservice_db save --database ${dbfile}
+   echo eservice database updated
+fi
 
 ## default pservice group
 pservice add --url http://localhost:7001
@@ -56,8 +72,8 @@ eservice --group e4 add --url http://localhost:7104 http://localhost:7105 http:/
 eservice --group e4 use --url http://localhost:7104
 
 ## eservice group e5
-eservice --group e4 add --url http://localhost:7105 http://localhost:7101 http://localhost:7102
-eservice --group e4 use --url http://localhost:7105
+eservice --group e5 add --url http://localhost:7105 http://localhost:7101 http://localhost:7102
+eservice --group e5 use --url http://localhost:7105
 
 ## eservice group all
 eservice --group all add --url http://localhost:7101 http://localhost:7102 http://localhost:7103 http://localhost:7104 http://localhost:7105

client/pdo/client/controller/commands/eservice_db.py

@@ -53,6 +53,7 @@ def command_eservice_db(state, bindings, pargs) :
 
     load_parser = subparsers.add_parser('load', description='load an eservice database')
     load_parser.add_argument('--database', help='Name of the eservice database to use', type=str, required=True)
+    load_parser.add_argument('-s', '--symbol', help='binding symbol for the result', type=str)
     merge_group = load_parser.add_mutually_exclusive_group(required=False)
     merge_group.add_argument('--merge', help='Merge new database with current db', dest='merge', action='store_true')
     merge_group.add_argument('--no-merge', help='Overwrite current db with new database', dest='merge', action='store_false')
@@ -64,6 +65,7 @@ def command_eservice_db(state, bindings, pargs) :
 
     save_parser = subparsers.add_parser('save', description='save the current eservice database')
     save_parser.add_argument('--database', help='Name of the eservice database to use', type=str, required=True)
+    save_parser.add_argument('-s', '--symbol', help='binding symbol for the result', type=str)
 
     options = parser.parse_args(pargs)
 
@@ -118,15 +120,21 @@ def command_eservice_db(state, bindings, pargs) :
         return
 
     if options.command == 'load' :
-        eservice_db.load_database(options.database, options.merge)
+        result = eservice_db.load_database(options.database, options.merge)
+        if options.symbol :
+            bindings.bind(options.symbol, result)
+
         return
 
     if options.command == 'remove' :
         eservice_db.remove_by_name(name=options.name)
         return
 
     if options.command == 'save' :
-        eservice_db.save_database(options.database, True)
+        result = eservice_db.save_database(options.database, True)
+        if options.symbol :
+            bindings.bind(options.symbol, result)
+
         return
 
     raise Exception('unknown subcommand')

contracts/wawaka/Makefile

@@ -16,8 +16,8 @@ ifndef PDO_INSTALL_ROOT
 $(error Incomplete configuration, PDO_INSTALL_ROOT is not defined)
 endif
 
-ifndef PDO_INTERPRETER
-$(error Incomplete configuration, PDO_INTERPRETER is not defined)
+ifndef PDO_HOME
+$(error Incomplete configuration, PDO_HOME is not defined)
 endif
 
 SCRIPTDIR ?= $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
@@ -54,17 +54,7 @@ debug :
 test : install interface-test interpreter-test memory-test mock-contract-test
 
 # this is the system test target, these tests require an eservice
-system-test : install eservice-db attestation-test kv-test
-
-ESERVICE_DB=$(DATA_DIR)/eservice-test-db.json
-eservice-db:
-	@ . $(abspath $(DSTDIR)/bin/activate) && \
-		pdo-eservicedb --loglevel $(TEST_LOG_LEVEL) -d $(ESERVICE_DB) reset --create && \
-		pdo-eservicedb --loglevel $(TEST_LOG_LEVEL) -d $(ESERVICE_DB) add -u http://localhost:7101 -n es7101 && \
-		pdo-eservicedb --loglevel $(TEST_LOG_LEVEL) -d $(ESERVICE_DB) add -u http://localhost:7102 -n es7102 && \
-		pdo-eservicedb --loglevel $(TEST_LOG_LEVEL) -d $(ESERVICE_DB) add -u http://localhost:7103 -n es7103 && \
-		pdo-eservicedb --loglevel $(TEST_LOG_LEVEL) -d $(ESERVICE_DB) add -u http://localhost:7104 -n es7104 && \
-		pdo-eservicedb --loglevel $(TEST_LOG_LEVEL) -d $(ESERVICE_DB) add -u http://localhost:7105 -n es7105
+system-test : install attestation-test kv-test
 
 interface-test:
 	@echo run test: $@
@@ -99,15 +89,13 @@ attestation-test:
 	@ . $(abspath $(DSTDIR)/bin/activate) && \
 		cd attestation-test && \
 		scripts/attestation-test.psh --loglevel $(TEST_LOG_LEVEL) --logfile $(TEST_LOG_FILE) \
-			-m eservice_dbfile $(ESERVICE_DB) \
 			-m test_data $(SCRIPTDIR)/attestation-test/scripts
 
 kv-test: kv-test/plugins/kv-test.py kv-test/scripts/kv-test.psh
 	@echo run test: $@
 	@ . $(abspath $(DSTDIR)/bin/activate) && \
 		cd kv-test && \
-		scripts/kv-test.psh --loglevel $(TEST_LOG_LEVEL) --logfile $(TEST_LOG_FILE) \
-			-m eservice_dbfile $(ESERVICE_DB)
+		scripts/kv-test.psh --loglevel $(TEST_LOG_LEVEL) --logfile $(TEST_LOG_FILE)
 
 install : build $(PLUGIN_SOURCE) $(SCRIPT_SOURCE)
 	@echo install contracts

contracts/wawaka/attestation-test/scripts/attestation-test.psh

@@ -22,11 +22,7 @@ set -q --conditional -s test_data -v ${data}
 set -q --conditional -s _contracts_ -v ${home}/contracts
 set -q --conditional -s _plugins_ -v ${_contracts_}/plugins
 
-## load the eservice database
-set -q --conditional -s eservice_dbfile -v ${data}/eservice-test-db.json
-eservice_db load --database ${eservice_dbfile}
-
-## load the eservice and pservice groups for the site
+## load the eservice and pservice groups and databases for the site
 script -f ${home}/etc/site.psh
 
 ## some definitions to make it easier to display text

contracts/wawaka/kv-test/scripts/kv-test.psh

@@ -22,10 +22,6 @@ set -q --conditional -s test_data -v ${data}
 set -q --conditional -s _contracts_ -v ${home}/contracts
 set -q --conditional -s _plugins_ -v ${_contracts_}/plugins
 
-## load the eservice database
-set -q --conditional -s eservice_dbfile -v ${data}/eservice-test-db.json
-eservice_db load --database ${eservice_dbfile}
-
 ## load the eservice and pservice groups for the site
 script -f ${home}/etc/site.psh