k2hr3-api 1.0.10 → 1.0.12

package/{test → tests}/auto_policy.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -1570,7 +1570,10 @@ describe('API : POLICY', function(){					// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_policy_spec.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -70,7 +70,10 @@ describe('SUB API TEST: POLICY', function(){			// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_resource.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -11008,7 +11008,10 @@ describe('API : RESOURCE', function(){					// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_resource_spec.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -70,7 +70,10 @@ describe('SUB API TEST: RESOURCE', function(){			// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_role.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -6157,7 +6157,10 @@ describe('API : ROLE', function(){						// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_role_spec.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -70,7 +70,10 @@ describe('SUB API TEST: ROLE', function(){				// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_service.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -761,7 +761,10 @@ describe('API : SERVICE', function(){					// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_service_spec.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -70,7 +70,10 @@ describe('SUB API TEST: SERVICE', function(){			// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_subprocesses.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -40,25 +40,25 @@ exports.start = function(parentobj)
 	//
 	// Run chmpx for server node
 	//
-	var	result = execSync('test/auto_control_subprocess.sh -start -key server -int 3 chmpx -conf test/auto_k2hdkc_server.ini -ctlport 18021 -d msg');
+	var	result = execSync('tests/auto_control_subprocess.sh --start --key server --interval 3 -- chmpx -conf tests/auto_k2hdkc_server.ini -ctlport 18021 -d msg');
 	console.log('    - run chmpx for server node: ' + String(result).replace(/\r?\n$/g, ''));
 
 	//
 	// Run k2hdkc
 	//
-	result = execSync('test/auto_control_subprocess.sh -start -key server -int 3 k2hdkc -conf test/auto_k2hdkc_server.ini -ctlport 18021 -d msg');
+	result = execSync('tests/auto_control_subprocess.sh --start --key server --interval 3 -- k2hdkc -conf tests/auto_k2hdkc_server.ini -ctlport 18021 -d msg');
 	console.log('    - run k2hdkc: ' + String(result).replace(/\r?\n$/g, ''));
 
 	//
 	// Run chmpx for slave node
 	//
-	result = execSync('test/auto_control_subprocess.sh -start -key slave -int 3 chmpx -conf test/auto_k2hdkc_slave.ini -ctlport 18031 -d msg');
+	result = execSync('tests/auto_control_subprocess.sh --start --key slave --interval 3 -- chmpx -conf tests/auto_k2hdkc_slave.ini -ctlport 18031 -d msg');
 	console.log('    - run chmpx for slave node: ' + String(result).replace(/\r?\n$/g, ''));
 
 	//
 	// Load default test data to k2hdkc
 	//
-	result = execSync('test/k2hdkc_test_load.sh --for_auto_test');
+	result = execSync('tests/k2hdkc_test_load.sh --for_auto_test');
 	console.log('    - loaded test data : ' + String(result));
 	console.log('');
 
@@ -83,19 +83,19 @@ exports.stop = function(parentobj)
 	//
 	// Stop chmpx for slave node
 	//
-	var	result = execSync('test/auto_control_subprocess.sh -stop -key slave -int 3 chmpx');
+	var	result = execSync('tests/auto_control_subprocess.sh --stop --key slave --interval 3 -- chmpx');
 	console.log('    - stop chmpx for slave node: ' + String(result).replace(/\r?\n$/g, ''));
 
 	//
 	// Stop k2hdkc
 	//
-	result = execSync('test/auto_control_subprocess.sh -stop -key server -int 3 k2hdkc');
+	result = execSync('tests/auto_control_subprocess.sh --stop --key server --interval 3 -- k2hdkc');
 	console.log('    - stop k2hdkc: ' + String(result).replace(/\r?\n$/g, ''));
 
 	//
 	// Stop chmpx for slave node
 	//
-	result = execSync('test/auto_control_subprocess.sh -stop -key server -int 3 chmpx');
+	result = execSync('tests/auto_control_subprocess.sh --stop --key server --interval 3 -- chmpx');
 	console.log('    - stop chmpx for server node: ' + String(result).replace(/\r?\n$/g, ''));
 
 	//
@@ -105,7 +105,10 @@ exports.stop = function(parentobj)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/tests/auto_template.sh

@@ -0,0 +1,126 @@
+#!/bin/sh
+#
+# K2HR3 REST API
+#
+# Copyright 2017 Yahoo Japan Corporation.
+#
+# K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
+# common management information for the cloud.
+# K2HR3 can dynamically manage information as "who", "what", "operate".
+# These are stored as roles, resources, policies in K2hdkc, and the
+# client system can dynamically read and modify these information.
+#
+# For the full copyright and license information, please view
+# the license file that was distributed with this source code.
+#
+# AUTHOR:   Takeshi Nakatani
+# CREATE:   Wed Jan 17 2018
+# REVISION:
+#
+
+#==========================================================
+# Common Variables
+#==========================================================
+PRGNAME=$(basename "$0")
+SCRIPTDIR=$(dirname "$0")
+SCRIPTDIR=$(cd "${SCRIPTDIR}" || exit 1; pwd)
+SRCTOP=$(cd "${SCRIPTDIR}/.." || exit 1; pwd)
+
+#
+# Variables
+#
+TEST_PROGRAM="${SRCTOP}/tests/k2hr3template_test.sh"
+VARS_FILE="${SRCTOP}/tests/k2hr3template_test_vars.js"
+TEMPL_FILE="${SRCTOP}/tests/k2hr3template_test_template.txt"
+SUCCESS_FILE="${SRCTOP}/tests/k2hr3template_test_template.result"
+EXPANDED_FILE="/tmp/k2hr3template_test_template.result"
+
+#==============================================================
+# Utility functions
+#==============================================================
+#
+# Usage
+#
+PrintUsage()
+{
+	echo ""
+	echo "Usage: $1 [--debuglevel(-d) DBG/MSG/WARN/ERR/(custom debug level)] [--async(-a)]"
+	echo ""
+}
+
+#==========================================================
+# Parse options
+#==========================================================
+DEBUG_OPTION=""
+DEBUG_ENV_DBG=0
+ASYNC_OPTION=""
+
+while [ $# -ne 0 ]; do
+	if [ -z "$1" ]; then
+		break
+
+	elif [ "$1" = "-h" ] || [ "$1" = "-H" ] || [ "$1" = "--help" ] || [ "$1" = "--HELP" ]; then
+		PrintUsage "${PRGNAME}"
+		exit 0
+
+	elif [ "$1" = "-d" ] || [ "$1" = "-D" ] || [ "$1" = "--debuglevel" ] || [ "$1" = "--DEBUGLEVEL" ]; then
+		if [ -n "${DEBUG_OPTION}" ]; then
+			echo "[ERROR] already specified --debuglevel(-d) option"
+			exit 1
+		fi
+		shift
+		if [ $# -eq 0 ]; then
+			echo "[ERROR] --debuglevel(-d) option needs parameter(dbg/msg/warn/err)"
+			exit 1
+		fi
+
+		if [ "$1" = "dbg" ] || [ "$1" = "DBG" ] || [ "$1" = "debug" ] || [ "$1" = "DEBUG" ]; then
+			DEBUG_ENV_DBG=1
+		fi
+		DEBUG_OPTION="-d $1"
+
+	elif [ "$1" = "-a" ] || [ "$1" = "-A" ] || [ "$1" = "--async" ] || [ "$1" = "--ASYNC" ]; then
+		if [ -n "${ASYNC_OPTION}" ]; then
+			echo "[ERROR] already specified --async(-a) option"
+			exit 1
+		fi
+		ASYNC_OPTION="--async"
+
+	else
+		echo "[ERROR] Unknown option $1"
+		exit 1
+	fi
+	shift
+done
+
+#==========================================================
+# Do work
+#==========================================================
+if [ "${DEBUG_ENV_DBG}" -eq 1 ]; then
+	echo "[DEBUG] Run(execute template engine)"
+	echo "        ${TEST_PROGRAM} -v ${VARS_FILE} -t ${TEMPL_FILE} ${ASYNC_OPTION} > ${EXPANDED_FILE}"
+	echo ""
+fi
+if ! /bin/sh -c "${TEST_PROGRAM} -v ${VARS_FILE} -t ${TEMPL_FILE} ${DEBUG_OPTION} ${ASYNC_OPTION} > ${EXPANDED_FILE}"; then
+	exit 1
+fi
+
+if [ "${DEBUG_ENV_DBG}" -eq 1 ]; then
+	echo "[DEBUG] Run(compare result)"
+	echo "        diff ${EXPANDED_FILE} ${SUCCESS_FILE}"
+	echo ""
+fi
+if ! diff "${EXPANDED_FILE}" "${SUCCESS_FILE}"; then
+	exit 1
+fi
+
+exit 0
+
+#
+# Local variables:
+# tab-width: 4
+# c-basic-offset: 4
+# End:
+# vim600: noexpandtab sw=4 ts=4 fdm=marker
+# vim<600: noexpandtab sw=4 ts=4
+#

package/{test → tests}/auto_token_util.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -210,7 +210,10 @@ exports.before = function(parentobj, alltoken, done)
 };
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_userdata.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -280,7 +280,10 @@ describe('API : USERDATA', function(){					// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_userdata_spec.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -70,7 +70,10 @@ describe('SUB API TEST: USERDATA', function(){			// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_usertokens.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -556,7 +556,10 @@ describe('API : USER TOKEN', function(){				// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_usertokens_spec.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -70,7 +70,10 @@ describe('SUB API TEST: USER TOKEN', function(){		// eslint-disable-line no-unde
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_version.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -102,7 +102,10 @@ describe('API : VERSION', function(){					// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_version_spec.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -70,7 +70,10 @@ describe('SUB API TEST: VERSION', function(){			// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_watcher.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -148,7 +148,10 @@ describe('PROCESS : WATHCER', function(){				// eslint-disable-line no-undef
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/auto_watcher_spec.js

@@ -1,7 +1,7 @@
 /*
  * K2HR3 REST API
  *
- * Copyright 2017 Yahoo! Japan Corporation.
+ * Copyright 2017 Yahoo Japan Corporation.
  *
  * K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
  * common management information for the cloud.
@@ -70,7 +70,10 @@ describe('SUB PROCESS TEST: WATCHER', function(){		// eslint-disable-line no-und
 });
 
 /*
- * VIM modelines
- *
- * vim:set ts=4 fenc=utf-8:
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noexpandtab sw=4 ts=4 fdm=marker
+ * vim<600: noexpandtab sw=4 ts=4
  */

package/{test → tests}/k2hdkc_test.data

@@ -1,7 +1,7 @@
 #
 # K2HR3 REST API
 #
-# Copyright 2017 Yahoo! Japan Corporation.
+# Copyright 2017 Yahoo Japan Corporation.
 #
 # K2HR3 is K2hdkc based Resource and Roles and policy Rules, gathers 
 # common management information for the cloud.
@@ -977,7 +977,10 @@ exit
 # END OF COMMAND
 ################################################################
 #
-# VIM modelines
-#
-# vim:set ts=4 fenc=utf-8:
+# Local variables:
+# tab-width: 4
+# c-basic-offset: 4
+# End:
+# vim600: noexpandtab sw=4 ts=4 fdm=marker
+# vim<600: noexpandtab sw=4 ts=4
 #