k2hr3-api 1.0.24 → 1.0.26

package/lib/k2hr3keys.js

@@ -76,6 +76,7 @@ exports.getK2hr3Keys = function(user, tenant, service)
 		'VALUE_KEYSTONE_SUB':			'kstype_substitute',
 		'VALUE_OPENSTACK_V1':			'openstack-auto-v1',												// used/set from k2hr3-init.sh
 		'VALUE_K8S_V1':					'k8s-auto-v1',														// used/set from k2hr3-kube-init.sh
+		'VALUE_PREFIX_LOCAL_TENANT':	'local@',
 
 		// common keywords( part of keyname )
 		'POLICIES_KW':					'policies',

package/lib/k2hr3tokens.js

@@ -237,6 +237,34 @@ function rawGetScopedUserToken(unscopedtoken, username, userid, tenant, callback
 			}
 			_tenant_list.push(jsonres[cnt].name);
 		}
+
+		// get and add local tenants
+		var	tmpresobj = k2hr3.listLocalTenant(_username, true);
+		if(!apiutil.isSafeEntity(tmpresobj) || !apiutil.isSafeEntity(tmpresobj.result) || false === tmpresobj.result){
+			if(apiutil.isSafeEntity(tmpresobj) && apiutil.isSafeString(tmpresobj.message)){
+				r3logger.wlog('failed to get local tenant list by ' + tmpresobj.message);
+			}else{
+				r3logger.wlog('failed to get local tenant list.');
+			}
+		}else{
+			if(!apiutil.isEmptyArray(tmpresobj.tenants)){
+				for(var cnt2 = 0; cnt2 < tmpresobj.tenants.length; ++cnt2){
+					var	one_tenant = tmpresobj.tenants[cnt2];
+					if(!apiutil.isSafeEntity(tmpresobj.tenants[cnt2])){
+						continue;
+					}
+					if(apiutil.compareCaseString(tmpresobj.tenants[cnt2].name, _tenant)){
+						// find target tenant
+						_tenant_id		= tmpresobj.tenants[cnt2].id;
+						_tenant_name	= tmpresobj.tenants[cnt2].name;
+						_tenant_desc	= tmpresobj.tenants[cnt2].desc;					// eslint-disable-line no-unused-vars
+						_tenant_display	= tmpresobj.tenants[cnt2].display;				// eslint-disable-line no-unused-vars
+					}
+					_tenant_list.push(one_tenant);
+				}
+			}
+		}
+
 		// check and remove old tenant for user
 		if(!k2hr3.removeComprehensionByNewTenants(_username, _tenant_list)){
 			r3logger.elog('failed to remove some tenant for user, but continue...');
@@ -611,16 +639,19 @@ function rawRemoveScopedUserToken(token)
 // 
 // result		:	null or token information
 //					{
-//						role:		role name
-//						user:		user name
-//						hostname:	always null
-//						ip:			always null
-//						port:		always 0
-//						cuk:		always null
-//						extra:		always null
-//						tenant:		tenant name
-//						scoped:		role token is always scoped(true)
-//						region:		when user token, the creator region name of the token
+//						role:			role name
+//						user:			user name
+//						hostname:		always null
+//						ip:				always null
+//						port:			always 0
+//						cuk:			always null
+//						extra:			always null
+//						tenant:			tenant name
+//						display:		display alias name for tenant
+//						id:				tenant id string
+//						description:	description for tenant
+//						scoped:			role token is always scoped(true)
+//						region:			when user token, the creator region name of the token
 //					}
 // 
 function rawCheckUserToken(token)
@@ -1719,16 +1750,19 @@ function rawGetDirectRoleTokenInfo(dkcobj_permanent, tokens)
 // 
 // result		:	null or token information
 //					{
-//						role:		role name
-//						user:		null or user name
-//						hostname:	null or host name
-//						ip:			null or ip address
-//						port:		port number(if host is existed), 0 means any
-//						cuk:		cuk(allowed null)
-//						extra:		extra(allowed null)
-//						tenant:		tenant name
-//						scoped:		role token is always scoped(true)
-//						region:		role token is always null
+//						role:			role name
+//						user:			null or user name
+//						hostname:		null or host name
+//						ip:				null or ip address
+//						port:			port number(if host is existed), 0 means any
+//						cuk:			cuk(allowed null)
+//						extra:			extra(allowed null)
+//						tenant:			tenant name
+//						display:		display alias name for tenant
+//						id:				tenant id string
+//						description:	description for tenant
+//						scoped:			role token is always scoped(true)
+//						region:			role token is always null
 //					}
 // 
 function rawCheckRoleToken(token, ip, port, cuk, is_strict)
@@ -1800,6 +1834,12 @@ function rawCheckRoleToken(token, ip, port, cuk, is_strict)
 		return null;
 	}
 
+	// Get tenant information
+	var	tenant_keys		= r3keys(null, value.tenant);
+	value.display		= apiutil.getSafeString(dkcobj.getValue(tenant_keys.TENANT_DISP_KEY, null, true, null));
+	value.id			= apiutil.getSafeString(dkcobj.getValue(tenant_keys.TENANT_ID_KEY, null, true, null));
+	value.description	= apiutil.getSafeString(dkcobj.getValue(tenant_keys.TENANT_DESC_KEY, null, true, null));
+
 	// compare ip address, if they are specified and token is not created by user
 	if(!apiutil.isSafeString(value.user)){
 		if(!apiutil.isSafeString(ip) || ip !== value.ip){
@@ -1881,17 +1921,20 @@ function rawCheckRoleToken(token, ip, port, cuk, is_strict)
 	}
 
 	// make result
-	var	token_info		= {};
-	token_info.role		= value.role;
-	token_info.user		= value.user;
-	token_info.hostname	= value.hostname;													// hostname
-	token_info.ip		= value.ip;
-	token_info.port		= value.port;
-	token_info.cuk		= value.cuk;
-	token_info.extra	= value.extra;
-	token_info.tenant	= value.tenant;
-	token_info.scoped	= true;																// role token is always scoped
-	token_info.region	= null;
+	var	token_info			= {};
+	token_info.role			= value.role;
+	token_info.user			= value.user;
+	token_info.hostname		= value.hostname;												// hostname
+	token_info.ip			= value.ip;
+	token_info.port			= value.port;
+	token_info.cuk			= value.cuk;
+	token_info.extra		= value.extra;
+	token_info.tenant		= value.tenant;
+	token_info.display		= value.display;
+	token_info.id			= value.id;
+	token_info.description	= value.description;
+	token_info.scoped		= true;															// role token is always scoped
+	token_info.region		= null;
 
 	return token_info;
 }
@@ -2124,10 +2167,19 @@ function rawGetUserTenantByToken(token)
 		dkcobj.clean();
 		return null;
 	}
-	var	username	= apiutil.getSafeString(matches[1]);
-	var	tenantname	= apiutil.getSafeString(matches[2]);
-	if('' === tenantname){
-		tenantname	= null;
+	var	user_name		= apiutil.getSafeString(matches[1]);
+	var	tenant_name		= apiutil.getSafeString(matches[2]);
+	var	tenant_display	= null;
+	var	tenant_id		= null;
+	var	tenant_desc		= null;
+
+	if('' === tenant_name){
+		tenant_name		= null;
+	}else{
+		var	tenant_keys	= r3keys(user_name, tenant_name);
+		tenant_display	= apiutil.getSafeString(dkcobj.getValue(tenant_keys.TENANT_DISP_KEY, null, true, null));
+		tenant_id		= apiutil.getSafeString(dkcobj.getValue(tenant_keys.TENANT_ID_KEY, null, true, null));
+		tenant_desc		= apiutil.getSafeString(dkcobj.getValue(tenant_keys.TENANT_DESC_KEY, null, true, null));
 	}
 
 	// if token has seed, need to check seed
@@ -2140,20 +2192,21 @@ function rawGetUserTenantByToken(token)
 		//
 		//r3logger.dlog('token key(' + user_token_key + ') has seed.');
 
-		var	vres = osapi.verifyUserToken(username, tenantname, token, token_seed);
+		var	vres = osapi.verifyUserToken(user_name, tenant_name, token, token_seed);
 		if(!vres.result){
 			r3logger.elog('failed to verify token(' + token + ') with seed by ' + vres.message);
 			return null;
 		}
 	}
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
 	var	result	= {
-					user:	username,
-					tenant:	tenantname,
-					region:	region
-				  };
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
+		user:			user_name,
+		tenant:			tenant_name,
+		display:		tenant_display,
+		id:				tenant_id,
+		description:	tenant_desc,
+		region:			region
+	};
 
 	return result;
 }
@@ -2163,8 +2216,10 @@ function rawGetUserTenantByToken(token)
 //---------------------------------------------------------
 //	result		[
 //					{
-//						name:		"tenant name",				=> tenant name which is "key" in k2hdkc
-//						display:	"display tenant name"		=> display alias name for tenant
+//						name:			"tenant name",			=> tenant name which is "key" in k2hdkc
+//						display:		"display tenant name"	=> display alias name for tenant
+//						id:				"tenant id"				=> tenant id string
+//						description:	"tenant description"	=> description for tenant
 //					},
 //					...
 //				]
@@ -2217,13 +2272,15 @@ function rawGetTenantListByUserWithDkc(dkcobj_permanent, user)
 	var	tenant_list			= new Array(0);
 	for(cnt = 0; cnt < name_list.length; ++cnt){
 		var	tenant_keys		= r3keys(user, name_list[cnt]);
-		var	display_name	= dkcobj_permanent.getValue(tenant_keys.TENANT_DISP_KEY, null, true, null);
-		if(!apiutil.isSafeEntity(display_name)){
-			display_name = '';
-		}
+		var	tenant_display	= apiutil.getSafeString(dkcobj_permanent.getValue(tenant_keys.TENANT_DISP_KEY, null, true, null));
+		var	tenant_id		= apiutil.getSafeString(dkcobj_permanent.getValue(tenant_keys.TENANT_ID_KEY, null, true, null));
+		var	tenant_desc		= apiutil.getSafeString(dkcobj_permanent.getValue(tenant_keys.TENANT_DESC_KEY, null, true, null));
+
 		tenant_list.push({
 			name:			name_list[cnt],
-			display:		display_name
+			display:		tenant_display,
+			id:				tenant_id,
+			description:	tenant_desc
 		});
 	}
 
@@ -2232,8 +2289,10 @@ function rawGetTenantListByUserWithDkc(dkcobj_permanent, user)
 
 //	result		[
 //					{
-//						name:		"tenant name",				=> tenant name which is "key" in k2hdkc
-//						display:	"display tenant name"		=> display alias name for tenant
+//						name:			"tenant name",			=> tenant name which is "key" in k2hdkc
+//						display:		"display tenant name"	=> display alias name for tenant
+//						id:				"tenant id"				=> tenant id string
+//						description:	"tenant description"	=> description for tenant
 //					},
 //					...
 //				]
@@ -2328,6 +2387,31 @@ function rawInitializeTenantListByToken(unscopedtoken, username, userid, callbac
 				display:	jsonres[cnt].display
 			});
 		}
+
+		// get and add local tenants
+		var	tmpresobj = k2hr3.listLocalTenant(_username, true);
+		if(!apiutil.isSafeEntity(tmpresobj) || !apiutil.isSafeEntity(tmpresobj.result) || false === tmpresobj.result){
+			if(apiutil.isSafeEntity(tmpresobj) && apiutil.isSafeString(tmpresobj.message)){
+				r3logger.wlog('failed to get local tenant list by ' + tmpresobj.message);
+			}else{
+				r3logger.wlog('failed to get local tenant list.');
+			}
+		}else{
+			if(!apiutil.isEmptyArray(tmpresobj.tenants)){
+				for(var cnt2 = 0; cnt2 < tmpresobj.tenants.length; ++cnt2){
+					var	one_tenant = tmpresobj.tenants[cnt2];
+					if(!apiutil.isSafeEntity(one_tenant)){
+						continue;
+					}
+					_name_list.push(one_tenant.name);
+					_tenant_list.push({
+						name:		one_tenant.name,
+						display:	one_tenant.display
+					});
+				}
+			}
+		}
+
 		// check and remove old tenant for user
 		if(!k2hr3.removeComprehensionByNewTenants(_username, _name_list)){
 			r3logger.elog('failed to remove some tenant for user, but continue...');
@@ -2376,15 +2460,18 @@ function rawCheckTenantInTenantList(tenants, tenant)
 //
 // token is following:
 //					{
-//						role:		role name
-//						user:		null or user name
-//						hostname:	null or host name
-//						ip:			null or host ip address
-//						port:		port number(if host is existed), 0 means any
-//						cuk:		cuk(allowed null)
-//						extra:		extra(allowed null)
-//						tenant:		tenant name
-//						scoped:		role token is always scoped(true)
+//						role:			role name
+//						user:			null or user name
+//						hostname:		null or host name
+//						ip:				null or host ip address
+//						port:			port number(if host is existed), 0 means any
+//						cuk:			cuk(allowed null)
+//						extra:			extra(allowed null)
+//						tenant:			tenant name
+//						display:		display alias name for tenant
+//						id:				tenant id string
+//						description:	description for tenant
+//						scoped:			role token is always scoped(true)
 //					}
 
 function rawCheckToken(req, is_scoped, is_user)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "k2hr3-api",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "dependencies": {
     "@kubernetes/client-node": "^0.18.1",
     "body-parser": "^1.20.2",
@@ -30,12 +30,12 @@
   "devDependencies": {
     "chai": "^4.3.7",
     "chai-http": "^4.4.0",
-    "eslint": "^8.43.0",
+    "eslint": "^8.44.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0"
   },
   "scripts": {
-    "help": "echo 'command list:\n    npm run start\n    npm run start:prod\n    npm run start:production\n    npm run start:prod:dbg\n    npm run start:prod:debug\n    npm run start:prod:debug:break\n    npm run start:prod:debug:nobreak\n    npm run start:dev\n    npm run start:develop\n    npm run start:dev:dbg\n    npm run start:dev:debug\n    npm run start:dev:debug:break\n    npm run start:dev:debug:nobreak\n    npm run start:watcher:prod\n    npm run start:watcher:production\n    npm run start:watcher:dev\n    npm run start:watcher:develop\n    npm run start:watcher:dbg\n    npm run start:watcher:debug\n    npm run start:watcher:debug:break\n    npm run start:watcher:debug:nobreak\n    npm run start:watcher:oneshot:prod\n    npm run start:watcher:oneshot:production\n    npm run start:watcher:oneshot:dev\n    npm run start:watcher:oneshot:develop\n    npm run start:watcher:oneshot:dbg\n    npm run start:watcher:oneshot:debug\n    npm run start:watcher:oneshot:debug:break\n    npm run start:watcher:oneshot:debug:nobreak\n    npm run stop\n    npm run stop:watcher\n    npm run test\n    npm run test:lint\n    npm run test:cover\n    npm run test:auto:all{:dbg}\n    npm run test:auto:version{:dbg}\n    npm run test:auto:usertokens{:dbg}\n    npm run test:auto:list{:dbg}\n    npm run test:auto:resource{:dbg}\n    npm run test:auto:policy{:dbg}\n    npm run test:auto:role{:dbg}\n    npm run test:auto:service{:dbg}\n    npm run test:auto:acr{:dbg}\n    npm run test:auto:userdata{:dbg}\n    npm run test:auto:extdata{:dbg}\n    npm run test:auto:watcher{:dbg}\n    npm run test:auto:templengine\n    npm run test:auto:templengine:async\n    npm run test:manual:apis:version_get\n    npm run test:manual:apis:usertoken_postput\n    npm run test:manual:apis:usertoken_gethead\n    npm run test:manual:apis:policy_postput\n    npm run test:manual:apis:policy_gethead\n    npm run test:manual:apis:policy_delete\n    npm run test:manual:apis:resource_postput\n    npm run test:manual:apis:resource_gethead\n    npm run test:manual:apis:resource_delete\n    npm run test:manual:apis:role_postput\n    npm run test:manual:apis:role_gethead\n    npm run test:manual:apis:role_delete\n    npm run test:manual:apis:service_postput\n    npm run test:manual:apis:service_gethead\n    npm run test:manual:apis:service_delete\n    npm run test:manual:apis:acr_postput\n    npm run test:manual:apis:acr_get\n    npm run test:manual:apis:acr_delete\n    npm run test:manual:apis:list_gethead\n    npm run test:manual:apis:userdata_get\n    npm run test:manual:apis:extdata_get\n    npm run test:manual:apis:allusertenant_get\n    npm run test:manual:apis:k2hr3keys_get\n    npm run test:manual:load:k2hdkcdata:auto\n    npm run test:manual:load:k2hdkcdata:local\n    npm run test:manual:templengine\n    npm run test:manual:templengine:async\n'",
+    "help": "echo 'command list:\n    npm run start\n    npm run start:prod\n    npm run start:production\n    npm run start:prod:dbg\n    npm run start:prod:debug\n    npm run start:prod:debug:break\n    npm run start:prod:debug:nobreak\n    npm run start:dev\n    npm run start:develop\n    npm run start:dev:dbg\n    npm run start:dev:debug\n    npm run start:dev:debug:break\n    npm run start:dev:debug:nobreak\n    npm run start:watcher:prod\n    npm run start:watcher:production\n    npm run start:watcher:dev\n    npm run start:watcher:develop\n    npm run start:watcher:dbg\n    npm run start:watcher:debug\n    npm run start:watcher:debug:break\n    npm run start:watcher:debug:nobreak\n    npm run start:watcher:oneshot:prod\n    npm run start:watcher:oneshot:production\n    npm run start:watcher:oneshot:dev\n    npm run start:watcher:oneshot:develop\n    npm run start:watcher:oneshot:dbg\n    npm run start:watcher:oneshot:debug\n    npm run start:watcher:oneshot:debug:break\n    npm run start:watcher:oneshot:debug:nobreak\n    npm run stop\n    npm run stop:watcher\n    npm run test\n    npm run test:lint\n    npm run test:cover\n    npm run test:auto:all{:dbg}\n    npm run test:auto:version{:dbg}\n    npm run test:auto:usertokens{:dbg}\n    npm run test:auto:list{:dbg}\n    npm run test:auto:resource{:dbg}\n    npm run test:auto:policy{:dbg}\n    npm run test:auto:role{:dbg}\n    npm run test:auto:service{:dbg}\n    npm run test:auto:acr{:dbg}\n    npm run test:auto:userdata{:dbg}\n    npm run test:auto:extdata{:dbg}\n    npm run test:auto:watcher{:dbg}\n    npm run test:auto:templengine\n    npm run test:auto:templengine:async\n    npm run test:manual:apis:version_get\n    npm run test:manual:apis:usertoken_postput\n    npm run test:manual:apis:usertoken_gethead\n    npm run test:manual:apis:policy_postput\n    npm run test:manual:apis:policy_gethead\n    npm run test:manual:apis:policy_delete\n    npm run test:manual:apis:resource_postput\n    npm run test:manual:apis:resource_gethead\n    npm run test:manual:apis:resource_delete\n    npm run test:manual:apis:role_postput\n    npm run test:manual:apis:role_gethead\n    npm run test:manual:apis:role_delete\n    npm run test:manual:apis:tenant_postput\n    npm run test:manual:apis:tenant_gethead\n    npm run test:manual:apis:tenant_delete\n    npm run test:manual:apis:service_postput\n    npm run test:manual:apis:service_gethead\n    npm run test:manual:apis:service_delete\n    npm run test:manual:apis:acr_postput\n    npm run test:manual:apis:acr_get\n    npm run test:manual:apis:acr_delete\n    npm run test:manual:apis:list_gethead\n    npm run test:manual:apis:userdata_get\n    npm run test:manual:apis:extdata_get\n    npm run test:manual:apis:allusertenant_get\n    npm run test:manual:apis:k2hr3keys_get\n    npm run test:manual:load:k2hdkcdata:auto\n    npm run test:manual:load:k2hdkcdata:local\n    npm run test:manual:templengine\n    npm run test:manual:templengine:async\n'",
     "start": "npm run start:production",
     "start:prod": "npm run start:production",
     "start:production": "bin/run.sh -bg --production && echo '' && echo 'Start on production - Success' && echo ''",
@@ -70,7 +70,7 @@
     "test": "npm run test:cover",
     "test:lint": "eslint lib/*.js app.js bin/www bin/watcher routes/*.js tests/*.js",
     "test:cover": "echo 'Test with coverage' && nyc --reporter=lcov --reporter=text npm run test:auto:all",
-    "test:auto": "echo 'Auto test : npm run test:auto:*\n      test:auto:all{:dbg}\n      test:auto:version{:dbg}\n      test:auto:usertokens{:dbg}\n      test:auto:list{:dbg}\n      test:auto:resource{:dbg}\n      test:auto:policy{:dbg}\n      test:auto:role{:dbg}\n      test:auto:service{:dbg}\n      test:auto:acr{:dbg}\n      test:auto:userdata{:dbg}\n      test:auto:extdata{:dbg}\n      test:auto:watcher{:dbg}\n      test:auto:templengine\n      test:auto:templengine:async\n'",
+    "test:auto": "echo 'Auto test : npm run test:auto:*\n      test:auto:all{:dbg}\n      test:auto:version{:dbg}\n      test:auto:usertokens{:dbg}\n      test:auto:list{:dbg}\n      test:auto:resource{:dbg}\n      test:auto:policy{:dbg}\n      test:auto:role{:dbg}\n      test:auto:tenant{:dbg}\n      test:auto:service{:dbg}\n      test:auto:acr{:dbg}\n      test:auto:userdata{:dbg}\n      test:auto:extdata{:dbg}\n      test:auto:watcher{:dbg}\n      test:auto:templengine\n      test:auto:templengine:async\n'",
     "test:auto:all": "echo 'All test' && npm run test:lint && tests/test.sh -t 8000 all && npm run test:auto:templengine && npm run test:auto:templengine:async && echo 'Succeed test' && echo ''",
     "test:auto:all:dbg": "echo 'All test with debugging' && npm run test:lint && tests/test.sh -t 8000 -d dbg all && echo 'Succeed test' && echo ''",
     "test:auto:version": "echo 'Test Version' && tests/test.sh -t 8000 version && echo 'Succeed test' && echo ''",
@@ -85,6 +85,8 @@
     "test:auto:policy:dbg": "echo 'Test Policy with debugging' && tests/test.sh -t 8000 -d dbg policy && echo 'Succeed test' && echo ''",
     "test:auto:role": "echo 'Test Role' && tests/test.sh -t 8000 role && echo 'Succeed test' && echo ''",
     "test:auto:role:dbg": "echo 'Test Role with debugging' && tests/test.sh -t 8000 -d dbg role && echo 'Succeed test' && echo ''",
+    "test:auto:tenant": "echo 'Test Tenant' && tests/test.sh -t 8000 tenant && echo 'Succeed test' && echo ''",
+    "test:auto:tenant:dbg": "echo 'Test Tenant with debugging' && tests/test.sh -t 8000 -d dbg tenant && echo 'Succeed test' && echo ''",
     "test:auto:service": "echo 'Test Service' && tests/test.sh -t 8000 service && echo 'Succeed test' && echo ''",
     "test:auto:service:dbg": "echo 'Test Service with debugging' && tests/test.sh -t 8000 -d dbg service && echo 'Succeed test' && echo ''",
     "test:auto:acr": "echo 'Test ACR' && tests/test.sh -t 8000 acr && echo 'Succeed test' && echo ''",
@@ -97,7 +99,7 @@
     "test:auto:watcher:dbg": "echo 'Test Watcher Process with debugging' && tests/test.sh -t 8000 -d dbg watcher && echo 'Succeed test' && echo ''",
     "test:auto:templengine": "echo 'Test template engine' && tests/auto_template.sh && echo 'Succeed test' && echo ''",
     "test:auto:templengine:async": "echo 'Test asynchronous template engine' && tests/auto_template.sh -a && echo 'Succeed test' && echo ''",
-    "test:manual": "echo 'Manual test : npm run test:manual:*\n      test:manual:apis:version_get\n      test:manual:apis:usertoken_postput\n      test:manual:apis:usertoken_gethead\n      test:manual:apis:policy_postput\n      test:manual:apis:policy_gethead\n      test:manual:apis:policy_delete\n      test:manual:apis:resource_postput\n      test:manual:apis:resource_gethead\n      test:manual:apis:resource_delete\n      test:manual:apis:role_postput\n      test:manual:apis:role_gethead\n      test:manual:apis:role_delete\n      test:manual:apis:service_postput\n      test:manual:apis:service_gethead\n      test:manual:apis:service_delete\n      test:manual:apis:acr_postput\n      test:manual:apis:acr_get\n      test:manual:apis:acr_delete\n      test:manual:apis:list_gethead\n      test:manual:apis:userdata_get\n      test:manual:apis:extdata_get\n      test:manual:apis:allusertenant_get\n      test:manual:apis:k2hr3keys_get\n      test:manual:load:k2hdkcdata:auto\n      test:manual:load:k2hdkcdata:local\n      test:manual:templengine\n      test:manual:templengine:async\n'",
+    "test:manual": "echo 'Manual test : npm run test:manual:*\n      test:manual:apis:version_get\n      test:manual:apis:usertoken_postput\n      test:manual:apis:usertoken_gethead\n      test:manual:apis:policy_postput\n      test:manual:apis:policy_gethead\n      test:manual:apis:policy_delete\n      test:manual:apis:resource_postput\n      test:manual:apis:resource_gethead\n      test:manual:apis:resource_delete\n      test:manual:apis:role_postput\n      test:manual:apis:role_gethead\n      test:manual:apis:role_delete\n      test:manual:apis:tenant_postput\n      test:manual:apis:tenant_gethead\n      test:manual:apis:tenant_delete\n      test:manual:apis:service_postput\n      test:manual:apis:service_gethead\n      test:manual:apis:service_delete\n      test:manual:apis:acr_postput\n      test:manual:apis:acr_get\n      test:manual:apis:acr_delete\n      test:manual:apis:list_gethead\n      test:manual:apis:userdata_get\n      test:manual:apis:extdata_get\n      test:manual:apis:allusertenant_get\n      test:manual:apis:k2hr3keys_get\n      test:manual:load:k2hdkcdata:auto\n      test:manual:load:k2hdkcdata:local\n      test:manual:templengine\n      test:manual:templengine:async\n'",
     "test:manual:apis:version_get": "tests/manual_test.sh version_get",
     "test:manual:apis:usertoken_postput": "tests/manual_test.sh usertoken_postput",
     "test:manual:apis:usertoken_gethead": "tests/manual_test.sh usertoken_gethead",
@@ -110,6 +112,9 @@
     "test:manual:apis:role_postput": "tests/manual_test.sh role_postput",
     "test:manual:apis:role_gethead": "tests/manual_test.sh role_gethead",
     "test:manual:apis:role_delete": "tests/manual_test.sh role_delete",
+    "test:manual:apis:tenant_postput": "tests/manual_test.sh tenant_postput",
+    "test:manual:apis:tenant_gethead": "tests/manual_test.sh tenant_gethead",
+    "test:manual:apis:tenant_delete": "tests/manual_test.sh tenant_delete",
     "test:manual:apis:service_postput": "tests/manual_test.sh service_postput",
     "test:manual:apis:service_gethead": "tests/manual_test.sh service_gethead",
     "test:manual:apis:service_delete": "tests/manual_test.sh service_delete",