k2hr3-api 1.0.38 → 1.0.39

package/lib/k2hr3template.js

@@ -2921,24 +2921,22 @@ VariableFormulaObject.prototype.testAssemble = function(statementsArray)
 	}
 	var	unitsArray	= statementsArray[0].formUnits[0];
 
-	/* eslint-disable no-mixed-spaces-and-tabs */
-	if(	0		!== unitsArray[0].indexOf(TEMPL_VALUESEP_KW)		&&
-		0		!== unitsArray[0].indexOf(TEMPL_HEX_PREFIX_KW)		&&
-		0		!== unitsArray[0].indexOf(TEMPL_HEX2_PREFIX_KW)		&&
-		0		!== unitsArray[0].indexOf(TEMPL_OCT_PREFIX_KW)		&&
-		0		!== unitsArray[0].indexOf(TEMPL_BIN_PREFIX_KW)		&&
-		null	!== unitsArray[0].match(/[^0-9]+/)					&&
+	if(	0 !== unitsArray[0].indexOf(TEMPL_VALUESEP_KW)				&&
+		0 !== unitsArray[0].indexOf(TEMPL_HEX_PREFIX_KW)			&&
+		0 !== unitsArray[0].indexOf(TEMPL_HEX2_PREFIX_KW)			&&
+		0 !== unitsArray[0].indexOf(TEMPL_OCT_PREFIX_KW)			&&
+		0 !== unitsArray[0].indexOf(TEMPL_BIN_PREFIX_KW)			&&
+		null !== unitsArray[0].match(/[^0-9]+/)						&&
 		!apiutil.compareCaseString(unitsArray[0], TEMPL_NULL_KW)	&&
 		!apiutil.compareCaseString(unitsArray[0], TEMPL_TRUE_KW)	&&
 		!apiutil.compareCaseString(unitsArray[0], TEMPL_FALSE_KW)	&&
-		!(2 < unitsArray[0].length &&
-		  ((0 === unitsArray[0].indexOf(TEMPL_SINGLE_QUOTE_KW)	&& TEMPL_SINGLE_QUOTE_KW === unitsArray[0].slice(-1)) ||
-		   (0 === unitsArray[0].indexOf(TEMPL_DOUBLE_QUOTE_KW)	&& TEMPL_DOUBLE_QUOTE_KW === unitsArray[0].slice(-1)) )
-		)
+		!(2 < unitsArray[0].length && (
+			(0 === unitsArray[0].indexOf(TEMPL_SINGLE_QUOTE_KW)	&& TEMPL_SINGLE_QUOTE_KW === unitsArray[0].slice(-1)) ||
+			(0 === unitsArray[0].indexOf(TEMPL_DOUBLE_QUOTE_KW)	&& TEMPL_DOUBLE_QUOTE_KW === unitsArray[0].slice(-1))
+		))
 	){
 		return false;
 	}
-	/* eslint-enable no-mixed-spaces-and-tabs */
 
 	return true;
 };
@@ -3169,10 +3167,10 @@ VariableFormulaObject.prototype.assemble = function(statementsArray, parentObjec
 		selfFormUnits.push([unitsArray[0]]);
 		unitsArray.shift();
 
-	}else if(2 < unitsArray[0].length &&
-			 ((0 === unitsArray[0].indexOf(TEMPL_SINGLE_QUOTE_KW) && TEMPL_SINGLE_QUOTE_KW === unitsArray[0].slice(-1)) ||		// eslint-disable-line no-mixed-spaces-and-tabs
-			  (0 === unitsArray[0].indexOf(TEMPL_DOUBLE_QUOTE_KW) && TEMPL_DOUBLE_QUOTE_KW === unitsArray[0].slice(-1)) ) )		// eslint-disable-line no-mixed-spaces-and-tabs
-	{
+	}else if(2 < unitsArray[0].length &&  (
+		(0 === unitsArray[0].indexOf(TEMPL_SINGLE_QUOTE_KW) && TEMPL_SINGLE_QUOTE_KW === unitsArray[0].slice(-1)) ||
+		(0 === unitsArray[0].indexOf(TEMPL_DOUBLE_QUOTE_KW) && TEMPL_DOUBLE_QUOTE_KW === unitsArray[0].slice(-1))
+	)){
 		//------------------
 		// static string('...' or "...")
 		//------------------
@@ -3785,18 +3783,20 @@ CalculateFormulaObject.prototype.assemble = function(statementsArray, parentObje
 		//--------------------------
 		// '-', '/', '*', '%', '<<', '>>' calculation
 		//--------------------------
-		/* eslint-disable indent */
-		this._calctype	= (	TEMPL_SUB_KW				=== unitsArray[0] ? FORMULA_CALC_TYPE_SUB	:
-							TEMPL_DIV_KW				=== unitsArray[0] ? FORMULA_CALC_TYPE_DIV	:								
-							TEMPL_MUL_KW				=== unitsArray[0] ? FORMULA_CALC_TYPE_MUL	:								
-							TEMPL_REM_KW				=== unitsArray[0] ? FORMULA_CALC_TYPE_REM	:								
-							TEMPL_LSHIFT_KW				=== unitsArray[0] ? FORMULA_CALC_TYPE_LSHIFT: FORMULA_CALC_TYPE_RSHIFT );	
-		errstrkw		= (	FORMULA_CALC_TYPE_SUB		=== this.getCalculateType() ? 'SUB(-)'		:								
-							FORMULA_CALC_TYPE_DIV		=== this.getCalculateType() ? 'DIV(/)'		:								
-							FORMULA_CALC_TYPE_MUL		=== this.getCalculateType() ? 'MUL(*)'		:								
-							FORMULA_CALC_TYPE_REM		=== this.getCalculateType() ? 'REM(%)'		:								
-							FORMULA_CALC_TYPE_LSHIFT	=== this.getCalculateType() ? 'LSHIFT(<<)'	: 'RSHIFT(>>)' );				
-		/* eslint-enable indent */
+		this._calctype = (
+			TEMPL_SUB_KW					=== unitsArray[0] ? FORMULA_CALC_TYPE_SUB	:
+				TEMPL_DIV_KW				=== unitsArray[0] ? FORMULA_CALC_TYPE_DIV	:
+					TEMPL_MUL_KW			=== unitsArray[0] ? FORMULA_CALC_TYPE_MUL	:
+						TEMPL_REM_KW		=== unitsArray[0] ? FORMULA_CALC_TYPE_REM	:
+							TEMPL_LSHIFT_KW	=== unitsArray[0] ? FORMULA_CALC_TYPE_LSHIFT: FORMULA_CALC_TYPE_RSHIFT
+		);
+		errstrkw = (
+			FORMULA_CALC_TYPE_SUB					=== this.getCalculateType() ? 'SUB(-)'		:
+				FORMULA_CALC_TYPE_DIV				=== this.getCalculateType() ? 'DIV(/)'		:
+					FORMULA_CALC_TYPE_MUL			=== this.getCalculateType() ? 'MUL(*)'		:
+						FORMULA_CALC_TYPE_REM		=== this.getCalculateType() ? 'REM(%)'		:
+							FORMULA_CALC_TYPE_LSHIFT=== this.getCalculateType() ? 'LSHIFT(<<)'	: 'RSHIFT(>>)'
+		);
 		selfFormUnits.push([unitsArray[0]]);
 		unitsArray.shift();
 
@@ -4204,13 +4204,13 @@ CalculateFormulaObject.prototype.execute = function(varmap)
 		//--------------------------
 		// '-', '/', '*', '%', '<<', '>>' calculation
 		//--------------------------
-		/* eslint-disable indent */
-		errstrkw	= (	FORMULA_CALC_TYPE_SUB		=== this.getCalculateType() ? 'SUB(-)'		:
-						FORMULA_CALC_TYPE_DIV		=== this.getCalculateType() ? 'DIV(/)'		:
-						FORMULA_CALC_TYPE_MUL		=== this.getCalculateType() ? 'MUL(*)'		:
+		errstrkw = (
+			FORMULA_CALC_TYPE_SUB					=== this.getCalculateType() ? 'SUB(-)'		:
+				FORMULA_CALC_TYPE_DIV				=== this.getCalculateType() ? 'DIV(/)'		:
+					FORMULA_CALC_TYPE_MUL			=== this.getCalculateType() ? 'MUL(*)'		:
 						FORMULA_CALC_TYPE_REM		=== this.getCalculateType() ? 'REM(%)'		:
-						FORMULA_CALC_TYPE_LSHIFT	=== this.getCalculateType() ? 'LSHIFT(<<)'	: 'RSHIFT(>>)' );
-		/* eslint-enable indent */
+							FORMULA_CALC_TYPE_LSHIFT=== this.getCalculateType() ? 'LSHIFT(<<)'	: 'RSHIFT(>>)'
+		);
 
 		// left template object
 		if(this.hasLeftTemplObject()){
@@ -4549,14 +4549,16 @@ ConditionFormulaObject.prototype.assemble = function(statementsArray, parentObje
 		//--------------------------
 		// '<', '>', '<=', '>=' condition
 		//--------------------------
-		/* eslint-disable indent */
-		this._condtype	= (	TEMPL_LESS_KW				=== unitsArray[0] ? FORMULA_COND_TYPE_LESS	: 
-							TEMPL_GREAT_KW				=== unitsArray[0] ? FORMULA_COND_TYPE_GREAT: 
-							TEMPL_LESSEQ_KW				=== unitsArray[0] ? FORMULA_COND_TYPE_LESSEQ: FORMULA_COND_TYPE_GREATEQ );
-		errstrkw		= (	FORMULA_COND_TYPE_LESS		=== this.getConditionType() ? 'LESS(<)'		: 
-							FORMULA_COND_TYPE_GREAT		=== this.getConditionType() ? 'GREAT(>)'	: 
-							FORMULA_COND_TYPE_LESSEQ	=== this.getConditionType() ? 'LESSEQ(<=)'	: 'GREATEQ(<=)' );
-		/* eslint-enable indent */
+		this._condtype = (
+			TEMPL_LESS_KW			=== unitsArray[0] ? FORMULA_COND_TYPE_LESS	:
+				TEMPL_GREAT_KW		=== unitsArray[0] ? FORMULA_COND_TYPE_GREAT	:
+					TEMPL_LESSEQ_KW	=== unitsArray[0] ? FORMULA_COND_TYPE_LESSEQ: FORMULA_COND_TYPE_GREATEQ
+		);
+		errstrkw = (
+			FORMULA_COND_TYPE_LESS			=== this.getConditionType() ? 'LESS(<)'		:
+				FORMULA_COND_TYPE_GREAT		=== this.getConditionType() ? 'GREAT(>)'	:
+					FORMULA_COND_TYPE_LESSEQ=== this.getConditionType() ? 'LESSEQ(<=)'	: 'GREATEQ(<=)'
+		);
 		selfFormUnits.push([unitsArray[0]]);
 		unitsArray.shift();
 
@@ -4725,16 +4727,16 @@ ConditionFormulaObject.prototype.execute = function(varmap)
 	var	right_resobj= null;
 	var	tmpval;
 
-	/* eslint-disable indent */
-	var	errstrkw	= (	FORMULA_COND_TYPE_AND		=== this.getConditionType() ? 'AND(&&)'		:
-						FORMULA_COND_TYPE_OR		=== this.getConditionType() ? 'OR(||)'		:
-						FORMULA_COND_TYPE_LESS		=== this.getConditionType() ? 'LESS(<)'		:
-						FORMULA_COND_TYPE_GREAT		=== this.getConditionType() ? 'GREAT(>)'	:
-						FORMULA_COND_TYPE_LESSEQ	=== this.getConditionType() ? 'LESSEQ(<=)'	:
-						FORMULA_COND_TYPE_GREATEQ	=== this.getConditionType() ? 'GREATEQ(<=)':
-						FORMULA_COND_TYPE_EQUAL		=== this.getConditionType() ? 'EQUAL(==)'	:
-						FORMULA_COND_TYPE_NOTEQ		=== this.getConditionType() ? 'NOTEQ(!=)' 	: 'UNKNOWN');
-	/* eslint-enable indent */
+	var	errstrkw = (
+		FORMULA_COND_TYPE_AND								=== this.getConditionType() ? 'AND(&&)'		:
+			FORMULA_COND_TYPE_OR							=== this.getConditionType() ? 'OR(||)'		:
+				FORMULA_COND_TYPE_LESS						=== this.getConditionType() ? 'LESS(<)'		:
+					FORMULA_COND_TYPE_GREAT					=== this.getConditionType() ? 'GREAT(>)'	:
+						FORMULA_COND_TYPE_LESSEQ			=== this.getConditionType() ? 'LESSEQ(<=)'	:
+							FORMULA_COND_TYPE_GREATEQ		=== this.getConditionType() ? 'GREATEQ(<=)'	:
+								FORMULA_COND_TYPE_EQUAL		=== this.getConditionType() ? 'EQUAL(==)'	:
+									FORMULA_COND_TYPE_NOTEQ	=== this.getConditionType() ? 'NOTEQ(!=)' 	: 'UNKNOWN'
+	);
 
 	// left template object
 	if(this.hasLeftTemplObject()){

package/lib/k2hr3tokens.js

@@ -213,8 +213,8 @@ function rawGetScopedUserToken(unscopedtoken, username, userid, tenant, callback
 		// check tenants(and initialize tenants)
 		var	_tenant_id		= null;
 		var	_tenant_name	= null;
-		var	_tenant_desc	= null;									// eslint-disable-line no-unused-vars
-		var	_tenant_display	= null;									// eslint-disable-line no-unused-vars
+		var	_tenant_desc	= null;
+		var	_tenant_display	= null;
 		var	_tenant_list	= new Array(0);
 		for(var cnt = 0; cnt < jsonres.length; ++cnt){
 			if(!apiutil.isSafeEntity(jsonres[cnt])){
@@ -232,8 +232,8 @@ function rawGetScopedUserToken(unscopedtoken, username, userid, tenant, callback
 				// find target tenant
 				_tenant_id		= jsonres[cnt].id;
 				_tenant_name	= jsonres[cnt].name;
-				_tenant_desc	= jsonres[cnt].description;			// eslint-disable-line no-unused-vars
-				_tenant_display	= jsonres[cnt].display;				// eslint-disable-line no-unused-vars
+				_tenant_desc	= jsonres[cnt].description;
+				_tenant_display	= jsonres[cnt].display;
 			}
 			_tenant_list.push(jsonres[cnt].name);
 		}

package/lib/k8soidc.js

@@ -951,7 +951,7 @@ function rawGetUserTenantListK8s(unscopedtoken, callback)
 // uname:	username
 // passwd:	passwd
 //
-exports.getUserUnscopedToken = function(uname, passwd, callback)	// eslint-disable-line no-unused-vars
+exports.getUserUnscopedToken = function(uname, passwd, callback)
 {
 	var	error = new Error('getUserUnscopedToken is not implemented');
 	r3logger.elog(error.message);
@@ -973,7 +973,7 @@ exports.getUserUnscopedTokenByToken = function(token, callback)
 //
 // tenantid: not used
 //
-exports.getUserScopedToken = function(unscopedtoken, tenantname, tenantid, callback)	// eslint-disable-line no-unused-vars
+exports.getUserScopedToken = function(unscopedtoken, tenantname, tenantid, callback)
 {
 	return rawGetUserScopedTokenK8s(unscopedtoken, tenantname, callback);
 };
@@ -997,7 +997,7 @@ exports.verifyUserToken = function(user, tenant, token, token_seed)
 //
 // Get tenant list
 //
-exports.getUserTenantList = function(unscopedtoken, userid, callback)	// eslint-disable-line no-unused-vars
+exports.getUserTenantList = function(unscopedtoken, userid, callback)
 {
 	return rawGetUserTenantListK8s(unscopedtoken, callback);
 };

package/lib/openstackapiv2.js

@@ -109,27 +109,27 @@ function rawGetUserUnscopedTokenV2(uname, passwd, callback)
 		//r3logger.dlog(keystone_ep);
 
 		// build parameters for request
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	body	= {	'auth': {
-							'tenantName':	'',						// unscoped token by no tenant name
-							'passwordCredentials':	{
-								'username':	_uname,
-								'password':	_passwd
-							}
-						}
-					  };
+		var	body = {
+			'auth': {
+				'tenantName':	'',						// unscoped token by no tenant name
+				'passwordCredentials': {
+					'username':	_uname,
+					'password':	_passwd
+				}
+			}
+		};
 		var	strbody	= JSON.stringify(body);
 		var	headers	= {
-						'Content-Type':		'application/json',
-						'Content-Length':	strbody.length
-					  };
-		var	options	= {	'host':				keystone_ep.hostname,
-						'port':				keystone_ep.port,
-						'path': 			keystone_ep.pathname + '/v2.0/tokens',
-						'method':			'POST',
-						'headers':			headers
-					  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			'Content-Type':		'application/json',
+			'Content-Length':	strbody.length
+		};
+		var	options	= {
+			'host':				keystone_ep.hostname,
+			'port':				keystone_ep.port,
+			'path': 			keystone_ep.pathname + '/v2.0/tokens',
+			'method':			'POST',
+			'headers':			headers
+		};
 
 		var	httpobj;
 		if(apiutil.compareCaseString('https:', keystone_ep.protocol)){
@@ -322,26 +322,26 @@ function rawGetUserScopedTokenV2(unscopedtoken, tenant, callback)
 		//r3logger.dlog(keystone_ep);
 
 		// build parameters for request
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	body	= {	'auth': {
-							'tenantName':	_tenant,
-							'token':	{
-								'id':		_unscopedtoken
-							}
-						}
-					  };
+		var	body = {
+			'auth': {
+				'tenantName': _tenant,
+				'token': {
+					'id': _unscopedtoken
+				}
+			}
+		};
 		var	strbody	= JSON.stringify(body);
 		var	headers	= {
-						'Content-Type':		'application/json',
-						'Content-Length':	strbody.length
-					  };
-		var	options	= {	'host':				keystone_ep.hostname,
-						'port':				keystone_ep.port,
-						'path': 			keystone_ep.pathname + '/v2.0/tokens',
-						'method':			'POST',
-						'headers':			headers
-					  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			'Content-Type':		'application/json',
+			'Content-Length':	strbody.length
+		};
+		var	options	= {
+			'host':				keystone_ep.hostname,
+			'port':				keystone_ep.port,
+			'path': 			keystone_ep.pathname + '/v2.0/tokens',
+			'method':			'POST',
+			'headers':			headers
+		};
 
 		var	httpobj;
 		if(apiutil.compareCaseString('https:', keystone_ep.protocol)){
@@ -601,19 +601,18 @@ function rawGetUserTenantListV2(unscopedtoken, callback)
 		//r3logger.dlog(keystone_ep);
 
 		// build parameters for request
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	headers		= {
-							'Content-Type':		'application/json',
-							'X-Auth-Token':		_unscopedtoken,
-							'Content-Length':	0
-						  };
-		var	options		= {	'host':				keystone_ep.hostname,
-							'port':				keystone_ep.port,
-							'path': 			keystone_ep.pathname + '/v2.0/tenants',
-							'method':			'GET',
-							'headers':			headers
-						  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+		var	headers = {
+			'Content-Type':		'application/json',
+			'X-Auth-Token':		_unscopedtoken,
+			'Content-Length':	0
+		};
+		var	options = {
+			'host':				keystone_ep.hostname,
+			'port':				keystone_ep.port,
+			'path': 			keystone_ep.pathname + '/v2.0/tenants',
+			'method':			'GET',
+			'headers':			headers
+		};
 
 		var	httpobj;
 		if(apiutil.compareCaseString('https:', keystone_ep.protocol)){
@@ -713,7 +712,7 @@ exports.getUserUnscopedToken = function(uname, passwd, callback)
 //
 // update token	: not implemented
 //
-exports.getUserUnscopedTokenByToken = function(token, callback)			// eslint-disable-line no-unused-vars
+exports.getUserUnscopedTokenByToken = function(token, callback)
 {
 	var	error = new Error('getUserUnscopedTokenByToken is not implemented');
 	r3logger.elog(error.message);
@@ -742,7 +741,7 @@ exports.verifyUserTokenPublisher = function(token_seed)
 //
 // tenant is not used.
 //
-exports.verifyUserToken = function(user, tenant, token, token_seed)				// eslint-disable-line no-unused-vars
+exports.verifyUserToken = function(user, tenant, token, token_seed)
 {
 	return rawVerifyUserTokenV2(user, token, token_seed);
 };

package/lib/openstackapiv3.js

@@ -115,34 +115,34 @@ function rawGetUserUnscopedTokenV3(uname, passwd, callback)
 		//r3logger.dlog(keystone_ep);
 
 		// build parameters for request
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	body	= {	'auth': {
-							'identity': {
-									'password': {
-										'user': {
-											'domain': {
-												'id': 'default'
-											},
-											'password':	_passwd,
-											'name':		_uname
-										}
-									},
-									'methods': ['password']
-								}
-							}
-						};
+		var	body = {
+			'auth': {
+				'identity': {
+					'password': {
+						'user': {
+							'domain': {
+								'id': 'default'
+							},
+							'password':	_passwd,
+							'name':		_uname
+						}
+					},
+					'methods': ['password']
+				}
+			}
+		};
 		var	strbody	= JSON.stringify(body);
 		var	headers	= {
-						'Content-Type':		'application/json',
-						'Content-Length':	strbody.length
-					  };
-		var	options	= {	'host':				keystone_ep.hostname,
-						'port':				keystone_ep.port,
-						'path': 			keystone_ep.pathname + '/v3/auth/tokens',
-						'method':			'POST',
-						'headers':			headers
-					  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			'Content-Type':		'application/json',
+			'Content-Length':	strbody.length
+		};
+		var	options	= {
+			'host':				keystone_ep.hostname,
+			'port':				keystone_ep.port,
+			'path': 			keystone_ep.pathname + '/v3/auth/tokens',
+			'method':			'POST',
+			'headers':			headers
+		};
 
 		var	httpobj;
 		if(apiutil.compareCaseString('https:', keystone_ep.protocol)){
@@ -314,28 +314,28 @@ function rawGetUserUnscopedTokenByOstokenV3(ostoken, callback)
 		//r3logger.dlog(keystone_ep);
 
 		// build parameters for request
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	body	= {	'auth': {
-							'identity': {
-									'token': {
-										'id': _ostoken,
-									},
-									'methods': ['token']
-								}
-							}
-						};
+		var	body = {
+			'auth': {
+				'identity': {
+					'token': {
+						'id': _ostoken,
+					},
+					'methods': ['token']
+				}
+			}
+		};
 		var	strbody	= JSON.stringify(body);
 		var	headers	= {
-						'Content-Type':		'application/json',
-						'Content-Length':	strbody.length
-					  };
-		var	options	= {	'host':				keystone_ep.hostname,
-						'port':				keystone_ep.port,
-						'path': 			keystone_ep.pathname + '/v3/auth/tokens',
-						'method':			'POST',
-						'headers':			headers
-					  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			'Content-Type':		'application/json',
+			'Content-Length':	strbody.length
+		};
+		var	options	= {
+			'host':				keystone_ep.hostname,
+			'port':				keystone_ep.port,
+			'path': 			keystone_ep.pathname + '/v3/auth/tokens',
+			'method':			'POST',
+			'headers':			headers
+		};
 
 		var	httpobj;
 		if(apiutil.compareCaseString('https:', keystone_ep.protocol)){
@@ -558,35 +558,35 @@ function rawGetUserScopedTokenV3(unscopedtoken, tenantid, callback)
 		//r3logger.dlog(keystone_ep);
 
 		// build parameters for request
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	body	= {	'auth': {
-							'identity': {
-								'methods': [
-									'token'
-								],
-								'token': {
-									'id': _unscopedtoken
-								}
-							},
-							'scope': {
-								'project': {
-									'id': _tenantid
-								}
-							}
-						}
-					};
+		var	body = {
+			'auth': {
+				'identity': {
+					'methods': [
+						'token'
+					],
+					'token': {
+						'id': _unscopedtoken
+					}
+				},
+				'scope': {
+					'project': {
+						'id': _tenantid
+					}
+				}
+			}
+		};
 		var	strbody	= JSON.stringify(body);
 		var	headers	= {
-						'Content-Type':		'application/json',
-						'Content-Length':	strbody.length
-					  };
-		var	options	= {	'host':				keystone_ep.hostname,
-						'port':				keystone_ep.port,
-						'path': 			keystone_ep.pathname + '/v3/auth/tokens',
-						'method':			'POST',
-						'headers':			headers
-					  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			'Content-Type':		'application/json',
+			'Content-Length':	strbody.length
+		};
+		var	options	= {
+			'host':				keystone_ep.hostname,
+			'port':				keystone_ep.port,
+			'path': 			keystone_ep.pathname + '/v3/auth/tokens',
+			'method':			'POST',
+			'headers':			headers
+		};
 
 		var	httpobj;
 		if(apiutil.compareCaseString('https:', keystone_ep.protocol)){
@@ -871,19 +871,18 @@ function rawGetUserTenantListV3(unscopedtoken, userid, callback)
 		//r3logger.dlog(keystone_ep);
 
 		// build parameters for request
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
-		var	headers		= {
-							'Content-Type':		'application/json',
-							'X-Auth-Token':		_unscopedtoken,
-							'Content-Length':	0
-						  };
-		var	options		= {	'host':				keystone_ep.hostname,
-							'port':				keystone_ep.port,
-							'path': 			keystone_ep.pathname + '/v3/users/' + _userid + '/projects',
-							'method':			'GET',
-							'headers':			headers
-						  };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+		var	headers = {
+			'Content-Type':		'application/json',
+			'X-Auth-Token':		_unscopedtoken,
+			'Content-Length':	0
+		};
+		var	options = {
+			'host':				keystone_ep.hostname,
+			'port':				keystone_ep.port,
+			'path': 			keystone_ep.pathname + '/v3/users/' + _userid + '/projects',
+			'method':			'GET',
+			'headers':			headers
+		};
 
 		var	httpobj;
 		if(apiutil.compareCaseString('https:', keystone_ep.protocol)){
@@ -1010,7 +1009,7 @@ exports.verifyUserTokenPublisher = function(token_seed)
 //
 // tenant is not used.
 //
-exports.verifyUserToken = function(user, tenant, token, token_seed)				// eslint-disable-line no-unused-vars
+exports.verifyUserToken = function(user, tenant, token, token_seed)
 {
 	return rawVerifyUserTokenV3(user, token, token_seed);
 };