k2hr3-api 1.0.38 → 1.0.40

package/tests/manual_role_delete.js

@@ -42,12 +42,10 @@ var	is_https = apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function deleteV1Role(token, name, target_host, port, cuk)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0,
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+	};
 
 	if(apiutil.isSafeString(token)){
 		headers['X-Auth-Token'] = token;
@@ -69,14 +67,13 @@ function deleteV1Role(token, name, target_host, port, cuk)
 		already_set	= true;
 	}
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/role/' + name + encodeURI(urlarg),
-						'method':			'DELETE',
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	options = {
+		'host':		hostname,
+		'port':		hostport,
+		'path': 	'/v1/role/' + name + encodeURI(urlarg),
+		'method':	'DELETE',
+		'headers':	headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));
@@ -128,12 +125,10 @@ function deleteV1Role(token, name, target_host, port, cuk)
 //
 function deleteV1_IPByCuk(addrs, port, cuk)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0,
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+	};
 
 	var urlarg		= '';
 	var	already_set	= false;
@@ -157,14 +152,13 @@ function deleteV1_IPByCuk(addrs, port, cuk)
 		already_set	= true;
 	}
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/role' + encodeURI(urlarg),
-						'method':			'DELETE',
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	options = {
+		'host':		hostname,
+		'port':		hostport,
+		'path': 	'/v1/role' + encodeURI(urlarg),
+		'method':	'DELETE',
+		'headers':	headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));

package/tests/manual_role_gethead.js

@@ -42,19 +42,18 @@ var	is_https = apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function getV1Role(token, name, is_expand)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0,
-						'X-Auth-Token':		token
-					  };
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/role/' + name + (is_expand ? '' : '?expand=false'),		// default expand is true
-						'method':			'GET',
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+		'X-Auth-Token':		token
+	};
+	var	options = {
+		'host':				hostname,
+		'port':				hostport,
+		'path': 			'/v1/role/' + name + (is_expand ? '' : '?expand=false'),		// default expand is true
+		'method':			'GET',
+		'headers':			headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));
@@ -103,25 +102,26 @@ function getV1Role(token, name, is_expand)
 
 function getV1RoleToken(token, name, expire)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0,
-					  };
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+	};
 	if(apiutil.isSafeString(token)){
 		headers['X-Auth-Token'] = token;
 	}
-	var	urlarg		= '';
+
+	var	urlarg = '';
 	if(null !== expire && !isNaN(expire)){
-		urlarg		= '?expire=' + String(expire);
+		urlarg = '?expire=' + String(expire);
 	}
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/role/token/' + name + urlarg,
-						'method':			'GET',
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+
+	var	options = {
+		'host':		hostname,
+		'port':		hostport,
+		'path': 	'/v1/role/token/' + name + urlarg,
+		'method':	'GET',
+		'headers':	headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));
@@ -169,21 +169,20 @@ function getV1RoleToken(token, name, expire)
 
 function getV1RoleTokenList(token, name, expand)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0,
-					  };
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+	};
 	if(apiutil.isSafeString(token)){
 		headers['X-Auth-Token'] = token;
 	}
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/role/token/list/' + name + (expand ? '?expand=true' : '?expand=false'),
-						'method':			'GET',
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	options = {
+		'host':		hostname,
+		'port':		hostport,
+		'path': 	'/v1/role/token/list/' + name + (expand ? '?expand=true' : '?expand=false'),
+		'method':	'GET',
+		'headers':	headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));
@@ -231,17 +230,17 @@ function getV1RoleTokenList(token, name, expand)
 
 function headV1Role(token, roleyrn, port, cuk)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0
-					  };
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0
+	};
 	if(apiutil.isSafeString(token)){
 		headers['X-Auth-Token'] = token;
 	}
-	var	urlargs		= '';
+
+	var	urlargs = '';
 	if(null !== port){
-		urlargs		= '?port=' + String(port);
+		urlargs = '?port=' + String(port);
 	}
 	if(apiutil.isSafeString(cuk)){
 		if(apiutil.isSafeString(urlargs)){
@@ -251,13 +250,14 @@ function headV1Role(token, roleyrn, port, cuk)
 		}
 		urlargs		+= cuk;
 	}
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/role/' + roleyrn + urlargs,
-						'method':			'HEAD',
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+
+	var	options = {
+		'host':		hostname,
+		'port':		hostport,
+		'path': 	'/v1/role/' + roleyrn + urlargs,
+		'method':	'HEAD',
+		'headers':	headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));

package/tests/manual_role_postput.js

@@ -42,27 +42,25 @@ var	is_https = apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function postV1Role(method, token, name, policies, alias)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	strbody		= '';
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'X-Auth-Token':		token
-					  };
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'method':			method
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	strbody = '';
+	var	headers = {
+		'Content-Type':		'application/json',
+		'X-Auth-Token':		token
+	};
+	var	options = {
+		'host':				hostname,
+		'port':				hostport,
+		'method':			method
+	};
 
 	if(apiutil.compareCaseString('post', method)){
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	body	= {	'role':
-						{	'name':			name,
-							'policies':		policies,
-							'alias':		alias
-						}
-					  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+		var	body = {
+			'role': {
+				'name':		name,
+				'policies':	policies,
+				'alias':	alias
+			}
+		};
 
 		strbody						= JSON.stringify(body);
 		headers['Content-Length']	= strbody.length;
@@ -149,18 +147,17 @@ function postV1Role(method, token, name, policies, alias)
 
 function postV1RoleHost(method, is_user_token, token, name, target_host, port, cuk, extra, tag, inboundip, outboundip)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	strbody		= '';
-	var	_token		= (is_user_token ? ('U=' + token) : ('R=' + token));
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'X-Auth-Token':		_token
-					  };
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'method':			method
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	strbody = '';
+	var	_token = (is_user_token ? ('U=' + token) : ('R=' + token));
+	var	headers = {
+		'Content-Type':	'application/json',
+		'X-Auth-Token':	_token
+	};
+	var	options = {
+		'host':			hostname,
+		'port':			hostport,
+		'method':		method
+	};
 
 	if(apiutil.compareCaseString('post', method)){
 		var	host_info				= {};

package/tests/manual_service_delete.js

@@ -47,19 +47,17 @@ function rawDeleteV1Service(token, service, tenant)
 		basepath	+= '?tenant=' + encodeURI(tenant);
 	}
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'X-Auth-Token':		'U=' + token
-					  };
-	var	options		= {
-						'host':				hostname,
-						'port':				hostport,
-						'path': 			basepath,
-						'method':			'DELETE',
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':	'application/json',
+		'X-Auth-Token':	'U=' + token
+	};
+	var	options = {
+		'host':			hostname,
+		'port':			hostport,
+		'path': 		basepath,
+		'method':		'DELETE',
+		'headers':		headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));

package/tests/manual_service_gethead.js

@@ -42,24 +42,22 @@ var	is_https	= apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function rawGetHeadV1Service(method, token, service, tenant)
 {
-	var	basepath	= '/v1/service/' + service;
+	var	basepath = '/v1/service/' + service;
 	if(apiutil.compareCaseString('HEAD', method) && apiutil.isSafeString(tenant)){
-		basepath	+= '?tenant=' + encodeURI(tenant);
+		basepath += '?tenant=' + encodeURI(tenant);
 	}
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'X-Auth-Token':		'U=' + token
-					  };
-	var	options		= {
-						'host':				hostname,
-						'port':				hostport,
-						'path': 			basepath,
-						'method':			method,
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':	'application/json',
+		'X-Auth-Token':	'U=' + token
+	};
+	var	options = {
+		'host':			hostname,
+		'port':			hostport,
+		'path': 		basepath,
+		'method':		method,
+		'headers':		headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));

package/tests/manual_service_postput.js

@@ -116,17 +116,16 @@ function rawPutPostV1Service(method, token, service, is_create, verify, is_verif
 		}
 	}
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'X-Auth-Token':		'U=' + token
-					  };
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'path': 			basepath,
-						'method':			method
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':	'application/json',
+		'X-Auth-Token':	'U=' + token
+	};
+	var	options = {
+		'host':			hostname,
+		'port':			hostport,
+		'path': 		basepath,
+		'method':		method
+	};
 
 	if(apiutil.compareCaseString('POST', method)){
 		headers['Content-Length']	= strbody.length;

package/tests/manual_test.sh

@@ -158,11 +158,11 @@ while [ $# -ne 0 ]; do
 	if [ -z "$1" ]; then
 		break
 
-	elif [ "$1" = "-h" ] || [ "$1" = "-H" ] || [ "$1" = "--help" ] || [ "$1" = "--HELP" ]; then
+	elif echo "$1" | grep -q -i -e "^-h$" -e "^--help$"; then
 		PrintUsage "${PRGNAME}"
 		exit 0
 
-	elif [ "$1" = "-a" ] || [ "$1" = "-A" ] || [ "$1" = "--apihost" ] || [ "$1" = "--APIHOST" ]; then
+	elif echo "$1" | grep -q -i -e "^-a$" -e "^--apihost$"; then
 		#
 		# API HOST
 		#
@@ -177,7 +177,7 @@ while [ $# -ne 0 ]; do
 		fi
 		APIHOST="$1"
 
-	elif [ "$1" = "-p" ] || [ "$1" = "-P" ] || [ "$1" = "--apiport" ] || [ "$1" = "--APIPORT" ]; then
+	elif echo "$1" | grep -q -i -e "^-p$" -e "^--apiport$"; then
 		#
 		# API PORT
 		#
@@ -199,21 +199,21 @@ while [ $# -ne 0 ]; do
 		fi
 		APIPORT="$1"
 
-	elif [ "$1" = "--https" ] || [ "$1" = "--HTTPS" ]; then
+	elif echo "$1" | grep -q -i "^--https$"; then
 		if [ -n "${HTTPS_ENV}" ]; then
 			echo "[ERROR] already specified --https or --http option"
 			exit 1
 		fi
 		HTTPS_ENV="yes"
 
-	elif [ "$1" = "--http" ] || [ "$1" = "--HTTP" ]; then
+	elif echo "$1" | grep -q -i "^--http$"; then
 		if [ -n "${HTTPS_ENV}" ]; then
 			echo "[ERROR] already specified --https or --http option"
 			exit 1
 		fi
 		HTTPS_ENV="no"
 
-	elif [ "$1" = "-d" ] || [ "$1" = "-D" ] || [ "$1" = "--debuglevel" ] || [ "$1" = "--DEBUGLEVEL" ]; then
+	elif echo "$1" | grep -q -i -e "^-d$" -e "^--debuglevel$"; then
 		#
 		# DEBUG option
 		#
@@ -222,25 +222,25 @@ while [ $# -ne 0 ]; do
 			echo "[ERROR] --debuglevel(-d) option needs parameter(dbg/msg/warn/err)"
 			exit 1
 		fi
-		if [ "$1" = "dbg" ] || [ "$1" = "DBG" ] || [ "$1" = "debug" ] || [ "$1" = "DEBUG" ]; then
+		if echo "$1" | grep -q -i -e "^dbg$" -e "^debug$"; then
 			if [ "${DEBUG_ENV_LEVEL}" -ne 0 ]; then
 				echo "[ERROR] --debuglevel(-d) option already is set"
 				exit 1
 			fi
 			DEBUG_ENV_LEVEL=4
-		elif [ "$1" = "msg" ] || [ "$1" = "MSG" ] || [ "$1" = "message" ] || [ "$1" = "MESSAGE" ] || [ "$1" = "info" ] || [ "$1" = "INFO" ]; then
+		elif echo "$1" | grep -q -i -e "^msg$" -e "^message$" -e "^info$"; then
 			if [ "${DEBUG_ENV_LEVEL}" -ne 0 ]; then
 				echo "[ERROR] --debuglevel(-d) option already is set"
 				exit 1
 			fi
 			DEBUG_ENV_LEVEL=3
-		elif [ "$1" = "warn" ] || [ "$1" = "WARN" ] || [ "$1" = "warning" ] || [ "$1" = "WARNING" ]; then
+		elif echo "$1" | grep -q -i -e "^wan$" -e "^warn$" -e "^warning$"; then
 			if [ "${DEBUG_ENV_LEVEL}" -ne 0 ]; then
 				echo "[ERROR] --debuglevel(-d) option already is set"
 				exit 1
 			fi
 			DEBUG_ENV_LEVEL=2
-		elif [ "$1" = "err" ] || [ "$1" = "ERR" ] || [ "$1" = "error" ] || [ "$1" = "ERROR" ]; then
+		elif echo "$1" | grep -q -i -e "^err$" -e "^error$"; then
 			if [ "${DEBUG_ENV_LEVEL}" -ne 0 ]; then
 				echo "[ERROR] --debuglevel(-d) option already is set"
 				exit 1

package/tests/manual_userdata_get.js

@@ -43,25 +43,24 @@ var	is_https = apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function getV1UserData(registerpath, is_gzip)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
 	var	headers;
 	if(is_gzip){
-		headers		= {
-						'Content-Type':		'application/octet-stream',
-						'User-Agent':		'Cloud-Init',
-						'Accept-Encoding':	'gzip'
-					   };
+		headers = {
+			'Content-Type':		'application/octet-stream',
+			'User-Agent':		'Cloud-Init',
+			'Accept-Encoding':	'gzip'
+		};
 	}else{
-		headers		= {
-						'Content-Type':		'application/octet-stream',
-						'User-Agent':		'Cloud-Init'
-					   };
+		headers = {
+			'Content-Type':		'application/octet-stream',
+			'User-Agent':		'Cloud-Init'
+		};
 	}
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'method':			'GET'
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	options = {
+		'host':		hostname,
+		'port':		hostport,
+		'method':	'GET'
+	};
 
 	options.headers	= headers;
 	options.path	= '/v1/userdata/' + encodeURI(registerpath);

package/tests/manual_usertoken_gethead.js

@@ -42,20 +42,18 @@ var	is_https = apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function headV1UserTokens(token, method)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json',
-						'Content-Length':	0,
-						'X-Auth-Token':		token
-					  };
-	var	options		= {
-						'host':				hostname,
-						'port':				hostport,
-						'path': 			'/v1/user/tokens',
-						'method':			method,
-						'headers':			headers
-					  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json',
+		'Content-Length':	0,
+		'X-Auth-Token':		token
+	};
+	var	options = {
+		'host':				hostname,
+		'port':				hostport,
+		'path': 			'/v1/user/tokens',
+		'method':			method,
+		'headers':			headers
+	};
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));

package/tests/manual_usertoken_postput.js

@@ -42,16 +42,15 @@ var	is_https = apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 function postV1UserTokens(method, token, othertoken, user, passwd, tenant)
 {
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
-	var	headers		= {
-						'Content-Type':		'application/json'
-					   };
-	var	options		= {	'host':				hostname,
-						'port':				hostport,
-						'method':			method
-					  };
-	var	strbody		= '';
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+	var	headers = {
+		'Content-Type':		'application/json'
+	};
+	var	options = {
+		'host':				hostname,
+		'port':				hostport,
+		'method':			method
+	};
+	var	strbody = '';
 
 	// set token if exists
 	var	is_user_cred_type = true;
@@ -66,26 +65,24 @@ function postV1UserTokens(method, token, othertoken, user, passwd, tenant)
 	if(apiutil.compareCaseString('post', method)){
 		// case for POST
 
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		var	body;
 		if(is_user_cred_type){
-			body	= {
-						'auth': {
-							'tenantName':	apiutil.isSafeString(tenant) ? tenant : '',
-							'passwordCredentials':	{
-								'username':	user,
-								'password':	passwd
-							}
-						}
-					  };
+			body = {
+				'auth': {
+					'tenantName':	apiutil.isSafeString(tenant) ? tenant : '',
+					'passwordCredentials':	{
+						'username':	user,
+						'password':	passwd
+					}
+				}
+			};
 		}else{
-			body	= {
-						'auth': {
-							'tenantName':	apiutil.isSafeString(tenant) ? tenant : ''
-						}
-					  };
+			body = {
+				'auth': {
+					'tenantName':	apiutil.isSafeString(tenant) ? tenant : ''
+				}
+			};
 		}
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
 
 		strbody						= JSON.stringify(body);
 		headers['Content-Length']	= strbody.length;