k2hr3-api 1.0.25 → 1.0.27

package/tests/auto_tenant.js

@@ -604,8 +604,7 @@ describe('API : TENANT', function(){					// eslint-disable-line no-undef
 				expect(res).to.be.json;
 				expect(res.body).to.be.an('object');
 				expect(res.body.result).to.be.a('boolean').to.be.false;
-				expect(res.body.message).to.be.a('string').to.have.string('PUT request failed to update tenant by failed to update tenant by could not find tenant(local@autotest_put_tenant_3) with user="dummyuser" and id=');
-
+				expect(res.body.message).to.be.a('string').to.have.string('PUT request tenant(local@autotest_put_tenant_3) does not allow user(dummyuser).');
 				done();
 			});
 	});
@@ -904,9 +903,9 @@ describe('API : TENANT', function(){					// eslint-disable-line no-undef
 	});
 
 	//
-	// Run Test(DELETE - TENANT - SUCCESS/FAILURE)
+	// Run Test(DELETE - TENANT USER - SUCCESS/FAILURE)
 	//
-	it('DELETE /v1/tenant/<tenant> : delete tenant(autotest_put_tenant_0) : success 200', function(done){					// eslint-disable-line no-undef
+	it('DELETE /v1/tenant/<tenant> : delete tenant user(autotest_put_tenant_0) : success 204', function(done){				// eslint-disable-line no-undef
 		var	uri	= '/v1/tenant/autotest_put_tenant_0';							// tenant name
 		uri		+= '?id=' + autotest_put_tenant_0_id;							// correct id
 
@@ -921,7 +920,7 @@ describe('API : TENANT', function(){					// eslint-disable-line no-undef
 			});
 	});
 
-	it('DELETE /v1/tenant/<tenant> : delete tenant(local@autotest_put_tenant_1) : success 200', function(done){				// eslint-disable-line no-undef
+	it('DELETE /v1/tenant/<tenant> : delete tenant user(local@autotest_put_tenant_1) : success 204', function(done){		// eslint-disable-line no-undef
 		var	uri	= '/v1/tenant/local@autotest_put_tenant_1';						// tenant name
 		uri		+= '?id=' + autotest_put_tenant_1_id;							// correct id
 
@@ -936,7 +935,7 @@ describe('API : TENANT', function(){					// eslint-disable-line no-undef
 			});
 	});
 
-	it('DELETE /v1/tenant/<tenant> : delete tenant(autotest_post_tenant_0) : failure(no token) 400', function(done){		// eslint-disable-line no-undef
+	it('DELETE /v1/tenant/<tenant> : delete tenant user(autotest_post_tenant_0) : failure(no token) 400', function(done){			// eslint-disable-line no-undef
 		var	uri	= '/v1/tenant/autotest_post_tenant_0';							// tenant name
 		uri		+= '?id=' + autotest_post_tenant_0_id;							// correct id
 
@@ -950,7 +949,7 @@ describe('API : TENANT', function(){					// eslint-disable-line no-undef
 			});
 	});
 
-	it('DELETE /v1/tenant/<tenant> : delete tenant(local@autotest_post_tenant_0) : failure(no token) 400', function(done){	// eslint-disable-line no-undef
+	it('DELETE /v1/tenant/<tenant> : delete tenant user(local@autotest_post_tenant_0) : failure(no token) 400', function(done){		// eslint-disable-line no-undef
 		var	uri	= '/v1/tenant/local@autotest_post_tenant_0';					// tenant name
 		uri		+= '?id=' + autotest_post_tenant_0_id;							// correct id
 
@@ -964,7 +963,7 @@ describe('API : TENANT', function(){					// eslint-disable-line no-undef
 			});
 	});
 
-	it('DELETE /v1/tenant/<tenant> : delete tenant(autotest_post_tenant_X) : failure(no exist tenant) 400', function(done){	// eslint-disable-line no-undef
+	it('DELETE /v1/tenant/<tenant> : delete tenant user(autotest_post_tenant_X) : failure(no exist tenant) 400', function(done){	// eslint-disable-line no-undef
 		var	uri	= '/v1/tenant/autotest_post_tenant_X';							// not exist tenant name
 		uri		+= '?id=' + autotest_post_tenant_0_id;							// wrong id
 
@@ -977,6 +976,118 @@ describe('API : TENANT', function(){					// eslint-disable-line no-undef
 				done();
 			});
 	});
+
+	//
+	// Run Test(DELETE - TENANT - SUCCESS/FAILURE)
+	//
+	it('DELETE /v1/tenant : delete tenant(autotest_post_tenant_0) : failure(no token) 400', function(done){				// eslint-disable-line no-undef
+		var	uri	= '/v1/tenant';
+		uri		+= '?tenant=autotest_post_tenant_0';							// tenant name
+		uri		+= '&id=' + autotest_post_tenant_0_id;							// correct id
+
+		chai.request(app)
+			.delete(uri)
+			.set('content-type', 'application/json')
+			.end(function(err, res){
+				expect(res).to.have.status(400);
+
+				done();
+			});
+	});
+
+	it('DELETE /v1/tenant : delete tenant(local@autotest_post_tenant_0) : failure(no tenant) 400', function(done){		// eslint-disable-line no-undef
+		var	uri	= '/v1/tenant';
+		uri		+= '?id=' + autotest_post_tenant_0_id;							// correct id
+
+		chai.request(app)
+			.delete(uri)
+			.set('content-type', 'application/json')
+			.set('x-auth-token', alltokens.unscopedtoken)						// unscoped token
+			.end(function(err, res){
+				expect(res).to.have.status(400);
+
+				done();
+			});
+	});
+
+	it('DELETE /v1/tenant : delete tenant(local@autotest_post_tenant_0) : failure(no id) 400', function(done){			// eslint-disable-line no-undef
+		var	uri	= '/v1/tenant';
+		uri		+= '?tenant=autotest_post_tenant_0';							// tenant name
+
+		chai.request(app)
+			.delete(uri)
+			.set('content-type', 'application/json')
+			.set('x-auth-token', alltokens.unscopedtoken)						// unscoped token
+			.end(function(err, res){
+				expect(res).to.have.status(400);
+
+				done();
+			});
+	});
+
+	it('DELETE /v1/tenant : delete tenant(autotest_post_tenant_X) : failure(no exist tenant) 400', function(done){		// eslint-disable-line no-undef
+		var	uri	= '/v1/tenant';
+		uri		+= '?tenant=autotest_post_tenant_X';							// not exist tenant name
+		uri		+= '&id=' + autotest_post_tenant_0_id;							// id
+
+		chai.request(app)
+			.delete(uri)
+			.set('content-type', 'application/json')
+			.set('x-auth-token', alltokens.unscopedtoken)						// unscoped token
+			.end(function(err, res){
+				expect(res).to.have.status(400);
+
+				done();
+			});
+	});
+
+	it('DELETE /v1/tenant : delete tenant(autotest_post_tenant_X) : failure(wrong id) 400', function(done){		// eslint-disable-line no-undef
+		var	uri	= '/v1/tenant';
+		uri		+= '?tenant=autotest_post_tenant_0';							// tenant name
+		uri		+= '&id=' + autotest_post_tenant_1_id;							// wrong id
+
+		chai.request(app)
+			.delete(uri)
+			.set('content-type', 'application/json')
+			.set('x-auth-token', alltokens.unscopedtoken)						// unscoped token
+			.end(function(err, res){
+				expect(res).to.have.status(400);
+
+				done();
+			});
+	});
+
+	it('DELETE /v1/tenant : delete tenant(autotest_post_tenant_0) : failure(not local@) 400', function(done){	// eslint-disable-line no-undef
+		var	uri	= '/v1/tenant';
+		uri		+= '?tenant=autotest_post_tenant_0';							// tenant name
+		uri		+= '&id=' + autotest_post_tenant_0_id;							// correct id
+
+		chai.request(app)
+			.delete(uri)
+			.set('content-type', 'application/json')
+			.set('x-auth-token', alltokens.unscopedtoken)						// unscoped token
+			.end(function(err, res){
+				expect(res).to.have.status(400);
+
+				done();
+			});
+	});
+
+	it('DELETE /v1/tenant/<tenant> : delete tenant(local@autotest_post_tenant_1) : success 204', function(done){		// eslint-disable-line no-undef
+		var	uri	= '/v1/tenant';
+		uri		+= '?tenant=local@autotest_post_tenant_1';						// tenant name
+		uri		+= '&id=' + autotest_post_tenant_1_id;							// correct id
+
+		chai.request(app)
+			.delete(uri)
+			.set('content-type', 'application/json')
+			.set('x-auth-token', alltokens.unscopedtoken)						// unscoped token
+			.end(function(err, res){
+				expect(res).to.have.status(204);
+
+				done();
+			});
+	});
 });
 
 /*

package/tests/auto_usertokens.js

@@ -431,11 +431,11 @@ describe('API : USER TOKEN', function(){				// eslint-disable-line no-undef
 				expect(res.body.scoped).to.be.a('boolean').to.be.false;
 				expect(res.body.user).to.be.a('string').to.equal('dummyuser');
 				expect(res.body.tenants).to.be.an.instanceof(Array).to.have.lengthOf(5);
-				expect(res.body.tenants[0]).to.deep.equal({name: 'tenant0', display: 'dummy_tenant_0'});
-				expect(res.body.tenants[1]).to.deep.equal({name: 'tenant1', display: 'dummy_tenant_1'});
-				expect(res.body.tenants[2]).to.deep.equal({name: 'tenant2', display: 'dummy_tenant_2'});
-				expect(res.body.tenants[3]).to.deep.equal({name: 'tenant3', display: 'dummy_tenant_3'});
-				expect(res.body.tenants[4]).to.deep.equal({name: 'tenant4', display: 'dummy_tenant_4'});
+				expect(res.body.tenants[0]).to.deep.equal({name: 'tenant0', id: '1000', description: 'dummy tenant no.0', display: 'dummy_tenant_0'});
+				expect(res.body.tenants[1]).to.deep.equal({name: 'tenant1', id: '1001', description: 'dummy tenant no.1', display: 'dummy_tenant_1'});
+				expect(res.body.tenants[2]).to.deep.equal({name: 'tenant2', id: '1002', description: 'dummy tenant no.2', display: 'dummy_tenant_2'});
+				expect(res.body.tenants[3]).to.deep.equal({name: 'tenant3', id: '1003', description: 'dummy tenant no.3', display: 'dummy_tenant_3'});
+				expect(res.body.tenants[4]).to.deep.equal({name: 'tenant4', id: '1004', description: 'dummy tenant no.4', display: 'dummy_tenant_4'});
 
 				done();
 			});
@@ -455,7 +455,7 @@ describe('API : USER TOKEN', function(){				// eslint-disable-line no-undef
 				expect(res.body.scoped).to.be.a('boolean').to.be.true;
 				expect(res.body.user).to.be.a('string').to.equal('dummyuser');
 				expect(res.body.tenants).to.be.an.instanceof(Array).to.have.lengthOf(1);
-				expect(res.body.tenants[0]).to.deep.equal({name: 'tenant0', display: 'tenant0'});
+				expect(res.body.tenants[0]).to.deep.equal({name: 'tenant0', id: '1000', description: 'dummy tenant no.0', display: 'dummy_tenant_0'});
 
 				done();
 			});

package/tests/manual_tenant_delete.js

@@ -40,20 +40,32 @@ var	is_https = apiutil.compareCaseString('yes', process.env.HTTPS_ENV);
 //
 // Request API for test
 //
-function deleteV1Tenant(token, name, id)
+function deleteV1Tenant(token, name, id, remove_all)
 {
 	var	headers = {
 		'Content-Type':		'application/json',
 		'Content-Length':	0,
 		'X-Auth-Token':		token
 	};
-	var	options = {
-		'host':				hostname,
-		'port':				hostport,
-		'path': 			'/v1/tenant/' + name + encodeURI('?id=' + id),
-		'method':			'DELETE',
-		'headers':			headers
-	};
+
+	var	options;
+	if(remove_all){
+		options = {
+			'host':				hostname,
+			'port':				hostport,
+			'path': 			'/v1/tenant' + encodeURI('?tenant=' + name) + '&' + encodeURI('id=' + id),
+			'method':			'DELETE',
+			'headers':			headers
+		};
+	}else{
+		options = {
+			'host':				hostname,
+			'port':				hostport,
+			'path': 			'/v1/tenant/' + name + encodeURI('?id=' + id),
+			'method':			'DELETE',
+			'headers':			headers
+		};
+	}
 
 	r3logger.dlog('request options   = ' + JSON.stringify(options));
 	r3logger.dlog('request headers   = ' + JSON.stringify(headers));
@@ -134,10 +146,32 @@ cliutil.getConsoleInput('Unscoped(or Scoped) user token       : ', true, false,
 			}
 			var	_id = apiutil.getSafeString(id);
 
-			//
-			// Run
-			//
-			deleteV1Tenant(_token, _tenant, _id);
+			cliutil.getConsoleInput('Remove tenant(yes/no(default))       : ', true, false, function(isbreak, remove_all)
+			{
+				if(isbreak){
+					process.exit(0);
+				}
+
+				var	_remove_all;
+				if(!apiutil.isSafeString(remove_all) || 'no' == remove_all || 'n' == remove_all){
+					_remove_all = false;
+				}else if('yes' == remove_all || 'y' == remove_all){
+					_remove_all = true;
+
+					if(0 !== _tenant.indexOf('local@')){
+						console.log('Need tenant name started with local@ for remove it.');
+						process.exit(0);
+					}
+				}else{
+					console.log('input must be yes or no(null)');
+					process.exit(0);
+				}
+
+				//
+				// Run
+				//
+				deleteV1Tenant(_token, _tenant, _id, _remove_all);
+			});
 		});
 	});
 });