diff options
| -rw-r--r-- | lib/cloudify.js | 93 | ||||
| -rw-r--r-- | lib/dcae-deployments.js | 48 | ||||
| -rw-r--r-- | lib/deploy.js | 54 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | tests/test_dcae-deployments.js | 285 | ||||
| -rw-r--r-- | tests/test_policy.js | 4 | ||||
| -rw-r--r-- | version.properties | 2 |
7 files changed, 381 insertions, 107 deletions
diff --git a/lib/cloudify.js b/lib/cloudify.js index 77e6d72..2c7af6e 100644 --- a/lib/cloudify.js +++ b/lib/cloudify.js @@ -92,6 +92,17 @@ const getDeploymentCreationStatus = function(req, deployment_id) { return doRequest(req, reqOptions, null, CLOUDIFY); }; +// Get blueprint_id for a particular deployment +exports.getBlueprintIdFromDeployment = function(req, deployment_id) { + const reqOptions = { + method : "GET", + uri : cfyAPI + "/deployments/" + deployment_id + "?_include=blueprint_id" + }; + addAuthToOptions(reqOptions, req); + + return doRequest(req, reqOptions, null, CLOUDIFY); +}; + // Poll for the result of a workflow execution until it's done // Return a promise for the final result of a workflow execution exports.waitForWorkflowExecution = function(mainReq, execution_id) { @@ -243,7 +254,7 @@ exports.uploadBlueprint = function(req, bpid, blueprint) { // Set up the HTTP PUT request const reqOptions = { method : "PUT", - uri : cfyAPI + "/blueprints/" + bpid, + uri : cfyAPI + "/blueprints/" + bpid + "?visibility=global", headers : { "Content-Type" : "application/octet-stream", "Accept" : "*/*" @@ -255,6 +266,86 @@ exports.uploadBlueprint = function(req, bpid, blueprint) { return doRequest(req, reqOptions, zip_buffer, CLOUDIFY); }; +// Checks if a blueprint exists in cloudify +exports.checkBlueprintExits = function(req, bpid) { + + // Set up the HTTP GET request + var reqOptions = { + method : "GET", + uri : cfyAPI + "/blueprints?id=" + bpid, + headers : { + "Content-Type" : "application/json", + "Accept" : "*/*" + } + }; + addAuthToOptions(reqOptions, req); + + return doRequest(req, reqOptions, null, CLOUDIFY) + + .then (function(result) { + if (result.json.metadata.pagination.total > 0 ) { + return true; + } + else { + return false; + } + }) + .catch(function(error) { + logger.debug(req.dcaeReqId, "Error getting BP from Cloudify for deployment id: " + req.params['deploymentId'] + " and blueprint id: " + bpid ); + throw(error); + }); +}; + +// Get the tenant_name associated with a blueprint +exports.getBlueprintTenantName = function(req, bpid) { + + // Set up the HTTP GET request + var reqOptions = { + method : "GET", + uri : cfyAPI + "/blueprints?id=" + bpid + "&_include=tenant_name", + headers : { + "Content-Type" : "application/json", + "Accept" : "*/*" + } + }; + addAuthToOptions(reqOptions, req); + + return doRequest(req, reqOptions, null, CLOUDIFY); +}; + +// Checks if a blueprint should be deleted from cloudify due to no associated deployments +exports.shouldBlueprintGetDeleted = function(req, bpid) { + + // Set up the HTTP GET request + var reqOptions = { + method : "GET", + uri : cfyAPI + "/deployments?blueprint_id=" + bpid + "&_all_tenants=true&_include=id", + headers : { + "Content-Type" : "application/json", + "Accept" : "*/*" + } + }; + const tenant = req.query.cfy_tenant_name; + req.query.cfy_tenant_name = DEFAULT_TENANT; + addAuthToOptions(reqOptions, req); + req.query.cfy_tenant_name = tenant; + + return doRequest(req, reqOptions, null, CLOUDIFY) + + .then (function(result) { + if (result.json.metadata.pagination.total > 0 ) { + return false; + } + else { + return true; + } + }) + .catch(function(error) { + logger.debug(req.dcaeReqId, "Error getting deployments info from Cloudify for deployment id: " + req.params['deploymentId'] + " and blueprint id: " + bpid ); + throw(error); + }); +}; + // Creates a deployment from a blueprint exports.createDeployment = function(req, dpid, bpid, inputs) { diff --git a/lib/dcae-deployments.js b/lib/dcae-deployments.js index 193f6b9..708a949 100644 --- a/lib/dcae-deployments.js +++ b/lib/dcae-deployments.js @@ -1,5 +1,5 @@ /* -Copyright(c) 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright(c) 2017-2020 AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -28,6 +28,7 @@ const deploy = require('./deploy'); const middleware = require('./middleware'); const inv = require('./inventory'); const log = require('./logging').getLogger(); +const DEFAULT_TENANT = "default_tenant"; /* Pick up config exported by main */ const config = process.mainModule.exports.config; @@ -63,7 +64,7 @@ const createLinks = function(req, deploymentId, executionId) { var baseURL = req.protocol + '://' + req.get('Host') + req.app.mountpath + '/' + deploymentId; return { self: baseURL, - status: baseURL + '/operation/' + executionId + status: baseURL + '/operation/' + executionId + '?cfy_tenant_name=' + req.query.cfy_tenant_name || DEFAULT_TENANT }; }; @@ -105,31 +106,20 @@ app.put('/:deploymentId', function(req, res, next) { throw e; } - /* Make sure the deploymentId doesn't already exist */ - inventory.verifyUniqueDeploymentId(req, req.params['deploymentId']) - - /* Get the blueprint for this service type */ - .then(function(res) { - return getBlueprint(req, req.body['serviceTypeId']); - }) - - /* Add this new service instance to inventory - * Easier to remove from inventory if deployment fails than vice versa - * Also lets client check for deployed/deploying instances if client wants to limit number of instances - */ - .then(function (blueprintInfo) { - req.dcaeBlueprint = blueprintInfo.blueprint; - return inventory.addService(req, req.params['deploymentId'], blueprintInfo.typeId, "dummyVnfId", "dummyVnfType", "dummyLocation"); - }) + return getBlueprint(req, req.body['serviceTypeId']) /* Upload blueprint, create deployment and start install workflow (but don't wait for completion */ - .then (function() { + .then (function(blueprintInfo) { + req.dcaeBlueprint = blueprintInfo.blueprint; + req.bpTypeId = blueprintInfo.typeId; req.dcaeAddedToInventory = true; - return deploy.launchBlueprint(req, req.params['deploymentId'], req.dcaeBlueprint, req.body['inputs']); + return deploy.launchBlueprint(req, req.params['deploymentId'], req.dcaeBlueprint, + "TID-" + req.bpTypeId, req.body['inputs']); }) /* Send the HTTP response indicating workflow has started */ .then(function(result) { + log.info(req.dcaeReqId, "Result from deployment creation/execution: " + JSON.stringify(result)); res.status(202).json(createResponse(req, result)); log.audit(req, 202, "Execution ID: " + result.executionId); return result; @@ -150,15 +140,6 @@ app.put('/:deploymentId', function(req, res, next) { /* If we haven't already sent a response, let the error handler send response and log the error */ if (!res.headersSent) { - - /* If we made an inventory entry, remove it */ - if (req.dcaeAddedToInventory) { - inventory.deleteService(req, req.params['deploymentId']) - .catch(function(error) { - log.error(error, req); - }); - } - next(error); } else { @@ -179,14 +160,6 @@ app.delete('/:deploymentId', function(req, res, next) { /* Launch the uninstall workflow */ deploy.launchUninstall(req, req.params['deploymentId']) - /* Delete the service from inventory */ - .then(function(result) { - return inventory.deleteService(req, req.params['deploymentId']) - .then (function() { - return result; - }); - }) - /* Send the HTTP response indicating workflow has started */ .then(function(result) { res.status(202).send(createResponse(req, result)); @@ -198,7 +171,6 @@ app.delete('/:deploymentId', function(req, res, next) { .then(function(result) { return deploy.finishUninstall(req, result.deploymentId, result.executionId); }) - /* Log completion in audit log */ .then(function(result) { log.audit(req, 200, "Undeployed id: " + req.params['deploymentId']); diff --git a/lib/deploy.js b/lib/deploy.js index cb78f6f..d4ce1d4 100644 --- a/lib/deploy.js +++ b/lib/deploy.js @@ -1,5 +1,5 @@ /* -Copyright(c) 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright(c) 2017-2020 AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -130,19 +130,32 @@ var delay = function(dtime) { // Go through the Cloudify API call sequence to upload blueprint, create deployment, and launch install workflow // (but don't wait for the workflow to finish) -exports.launchBlueprint = function(req, id, blueprint, inputs) { +exports.launchBlueprint = function(req, id, blueprint, bpid, inputs) { + const log_blueprint_id = "blueprintId(" + bpid + "): "; const log_deployment_id = "deploymentId(" + id + "): "; - var step_log = log_deployment_id + "uploading blueprint"; + var step_log = log_blueprint_id + "uploading blueprint"; logger.info(req.dcaeReqId, step_log); - return cfy.uploadBlueprint(req, id, blueprint) + + return cfy.checkBlueprintExits(req, bpid) + + .then (function (result) { + logger.info(req.dcaeReqId, " checkBlueprintExits result " + result); + // Upload blueprint + if ( result === false ) { + logger.info(req.dcaeReqId, " blueprint with id: " + log_blueprint_id + " does not exist. Uploading"); + return cfy.uploadBlueprint(req, bpid, blueprint) + } + else { + logger.info(req.dcaeReqId, " blueprint with id: " + log_blueprint_id + " already exits. No need to upload"); + } + }) .then (function(result) { step_log = log_deployment_id + "creating deployment"; logger.info(req.dcaeReqId, step_log); // Create deployment - return cfy.createDeployment(req, id, id, inputs); + return cfy.createDeployment(req, id, bpid, inputs); }) - // create the deployment and keep checking, for up to 5 minutes, until creation is complete .then(function(result) { step_log = log_deployment_id + "waiting for deployment creation"; @@ -210,22 +223,43 @@ exports.launchUninstall = function(req, deploymentId) { exports.finishUninstall = function(req, deploymentId, executionId) { logger.info(req.dcaeReqId, "finishUninstall: " + deploymentId + " -- executionId: " + executionId); + var bid = ""; return cfy.waitForWorkflowExecution(req, executionId) .then (function(result){ logger.info(req.dcaeReqId, "deploymentId: " + deploymentId + " uninstall workflow successfully executed"); + logger.info(req.dcaeReqId, "deploymentId: " + deploymentId + " getting associated blueprint_id"); + return cfy.getBlueprintIdFromDeployment(req, deploymentId); + }) + .then (function(result){ + bid = result.json.blueprint_id; + logger.info(req.dcaeReqId, "deploymentId: " + deploymentId + " associated blueprint_id: " + bid); // Delete the deployment return delay(DELAY_DELETE_DEPLOYMENT).then(function() { return cfy.deleteDeployment(req, deploymentId); - }); + }); }) .then (function(result){ logger.info(req.dcaeReqId, "deploymentId: " + deploymentId + " deployment deleted"); - // Delete the blueprint - return delay(DELAY_DELETE_BLUEPRINT).then(function() { - return cfy.deleteBlueprint(req, deploymentId); + return delay(DELAY_DELETE_DEPLOYMENT).then(function() { + return cfy.shouldBlueprintGetDeleted(req, bid); }); }) + .then (function (result) { + logger.info(req.dcaeReqId, "deploymentId: " + deploymentId + " shouldBlueprintGetDeleted: " + result); + if ( result === true ) { + return cfy.getBlueprintTenantName(req, bid) + .then (function(result){ + const tenant = result.json.items[0].tenant_name; + logger.info(req.dcaeReqId, "deploymentId: " + deploymentId + " deleting bluerpint with id: " + + bid + " and tenant_name: " + tenant); + // Delete the blueprint + req.query.cfy_tenant_name = tenant; + return cfy.deleteBlueprint(req, bid); + }); + } + }) .then (function(result){ + logger.info(req.dcaeReqId, "deploymentId: " + deploymentId + " done with uninstall"); return result; }) .catch (function(err){ @@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. <groupId>org.onap.dcaegen2.platform</groupId> <artifactId>deployment-handler</artifactId> <name>dcaegen2-platform-deployment-handler</name> - <version>4.3.0-SNAPSHOT</version> + <version>4.4.0-SNAPSHOT</version> <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/tests/test_dcae-deployments.js b/tests/test_dcae-deployments.js index 2f3f7fd..884b70c 100644 --- a/tests/test_dcae-deployments.js +++ b/tests/test_dcae-deployments.js @@ -1,5 +1,5 @@ /* -Copyright(c) 2018-2019 AT&T Intellectual Property. All rights reserved. +Copyright(c) 2018-2020 AT&T Intellectual Property. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ const Inventory = { "nextLink": { "rel": "next", "href": dh.INVENTORY_URL + INV_PATH_DCAE_SERVICES - + (service_type && "/" + INV_PARAM_TYPE_ID + service_type + "&offset=25") || "/?offset=25" + + (service_type && "/" + INV_PARAM_TYPE_ID + service_type + "&offset=25") || "/?offset=25" } }, "totalCount": totalCount || 190, @@ -156,17 +156,43 @@ const Inventory = { }; const Cloudify = { - resp_blueprint: function(deployment_id) { + resp_blueprint: function (blueprint_id) { return { "main_file_name": "blueprint.yaml", "description": null, + "tenant_name": "MTN23a-ECOMP-DEV-S1", "created_at": "2018-01-19 15:46:47.037084", "updated_at": "2018-01-19 15:46:47.037084", "plan": {}, - "id": deployment_id + "id": blueprint_id, + "metadata": { + "pagination": { + "total": 0, + "offset": 0, + "size": 0 + } + } + }; + }, + resp_blueprint_exists: function (blueprint_id) { + return { + "main_file_name": "blueprint.yaml", + "description": null, + "tenant_name": "MTN23a-ECOMP-DEV-S1", + "created_at": "2018-01-19 15:46:47.037084", + "updated_at": "2018-01-19 15:46:47.037084", + "plan": {}, + "id": blueprint_id, + "metadata": { + "pagination": { + "total": 1, + "offset": 0, + "size": 1000 + } + } }; }, - resp_deploy: function(deployment_id, blueprint_id, inputs) { + resp_deploy: function (deployment_id, blueprint_id, inputs) { return { "inputs": (inputs && JSON.parse(JSON.stringify(inputs)) || null), "description": null, @@ -176,7 +202,7 @@ const Cloudify = { "blueprint_id": blueprint_id || deployment_id }; }, - resp_dep_creation: function(deployment_id, execution_id, status) { + resp_dep_creation: function (deployment_id, execution_id, status) { return { "items": [ { @@ -193,7 +219,7 @@ const Cloudify = { } }; }, - resp_execution: function(deployment_id, blueprint_id, execution_id, terminated, workflow_id) { + resp_execution: function (deployment_id, blueprint_id, execution_id, terminated, workflow_id) { return { "status": (terminated && "terminated") || "pending", "created_at": "2018-01-19 15:51:21.866227", @@ -206,10 +232,29 @@ const Cloudify = { "id": execution_id }; }, - resp_outputs: function(deployment_id) { + resp_outputs: function (deployment_id) { return {"outputs": {}, "deployment_id": deployment_id}; + }, + resp_blueprint_id: function (blueprint_id) { + return {"blueprint_id": blueprint_id}; + }, + resp_blueprint_tenant_name: function (blueprint_id) { + return { + "items": [ + { + "tenant_name": "d4-site1_dyh1a_ECOMPCTD-27355-D-01" + } + ], + "metadata": { + "pagination": { + "total": 1, + "offset": 0, + "size": 1000 + } + } + }; } -}; +} function test_get_dcae_deployments(dh_server) { const req_path = "/dcae-deployments"; @@ -301,16 +346,18 @@ function test_put_dcae_deployments_i_dont_know(dh_server) { it('Fail to deploy i-dont-know service', function(done) { const action_timer = new utils.ActionTimer(); console.log(action_timer.step, test_txt); + /* nock(dh.INVENTORY_URL).get(INV_PATH_DCAE_SERVICES + "/" + I_DONT_KNOW) .reply(404, function(uri) { console.log(action_timer.step, "get", dh.INVENTORY_URL, uri); return JSON.stringify(Inventory.resp_not_found_service(I_DONT_KNOW)); }); + */ nock(dh.INVENTORY_URL).get(INV_PATH_DCAE_SERVICE_TYPES + I_DONT_KNOW) .reply(404, function(uri) { - console.log(action_timer.step, "get", dh.INVENTORY_URL, uri); - return "<html> <head><title>Error 404 Not Found</title></head><body></body> </html>"; - }); + console.log(action_timer.step, "get", dh.INVENTORY_URL, uri); + return "<html> <head><title>Error 404 Not Found</title></head><body></body> </html>"; + }); chai.request(dh_server.app).put(req_path) .set('content-type', 'application/json') @@ -335,16 +382,19 @@ function test_put_dcae_deployments_missing_input_error(dh_server) { const action_timer = new utils.ActionTimer(); console.log(action_timer.step, test_txt); + /* nock(dh.INVENTORY_URL).get(INV_PATH_DCAE_SERVICES + "/" + DEPLOYMENT_ID_JFL) .reply(404, function(uri) { console.log(action_timer.step, "get", dh.INVENTORY_URL, uri); return JSON.stringify(Inventory.resp_not_found_service(DEPLOYMENT_ID_JFL)); }); + */ nock(dh.INVENTORY_URL).get(INV_PATH_DCAE_SERVICE_TYPES + INV_EXISTING_SERVICE_TYPE) .reply(200, function(uri) { - console.log(action_timer.step, "get", dh.INVENTORY_URL, uri); - return JSON.stringify(Inventory.resp_existing_blueprint(INV_EXISTING_SERVICE_TYPE)); - }); + console.log(action_timer.step, "get", dh.INVENTORY_URL, uri); + return JSON.stringify(Inventory.resp_existing_blueprint(INV_EXISTING_SERVICE_TYPE)); + }); + /* nock(dh.INVENTORY_URL).put(INV_PATH_DCAE_SERVICES + "/" + DEPLOYMENT_ID_JFL) .reply(200, function(uri, requestBody) { console.log(action_timer.step, "put", dh.INVENTORY_URL, uri, JSON.stringify(requestBody)); @@ -355,12 +405,21 @@ function test_put_dcae_deployments_missing_input_error(dh_server) { console.log(action_timer.step, "delete", dh.INVENTORY_URL, uri); return ""; }); + */ + nock(dh.CLOUDIFY_URL).get(dh.CLOUDIFY_API + "/blueprints?id=" + "TID-" + INV_EXISTING_SERVICE_TYPE) + .reply(200, function(uri, requestBody) { + console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); + //return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL)); + return JSON.stringify(Cloudify.resp_blueprint("TID-" + INV_EXISTING_SERVICE_TYPE)); + }); - nock(dh.CLOUDIFY_URL).put(dh.CLOUDIFY_API + "/blueprints/" + DEPLOYMENT_ID_JFL) + //nock(dh.CLOUDIFY_URL).put(dh.CLOUDIFY_API + "/blueprints/" + DEPLOYMENT_ID_JFL) + nock(dh.CLOUDIFY_URL).put(dh.CLOUDIFY_API + "/blueprints/" + "TID-" + INV_EXISTING_SERVICE_TYPE + "?visibility=global") .reply(200, function(uri, requestBody) { - console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); - return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL)); - }); + console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); + //return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL)); + return JSON.stringify(Cloudify.resp_blueprint("TID-" + INV_EXISTING_SERVICE_TYPE)); + }); const depl_rejected = { "message": "Required inputs blah...", @@ -369,9 +428,9 @@ function test_put_dcae_deployments_missing_input_error(dh_server) { }; nock(dh.CLOUDIFY_URL).put(dh.CLOUDIFY_API + "/deployments/" + DEPLOYMENT_ID_JFL) .reply(400, function(uri) { - console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri); - return JSON.stringify(depl_rejected); - }); + console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri); + return JSON.stringify(depl_rejected); + }); chai.request(dh_server.app).put(req_path) .set('content-type', 'application/json') @@ -397,32 +456,44 @@ function test_put_dcae_deployments_creation_failed(dh_server) { const action_timer = new utils.ActionTimer(); console.log(action_timer.step, test_txt); + /* nock(dh.INVENTORY_URL).get(INV_PATH_DCAE_SERVICES + "/" + DEPLOYMENT_ID_JFL_1) .reply(404, function(uri) { console.log(action_timer.step, "get", dh.INVENTORY_URL, uri); return JSON.stringify(Inventory.resp_not_found_service(DEPLOYMENT_ID_JFL_1)); }); + + */ nock(dh.INVENTORY_URL).get(INV_PATH_DCAE_SERVICE_TYPES + INV_EXISTING_SERVICE_TYPE) .reply(200, function(uri) { console.log(action_timer.step, "get", dh.INVENTORY_URL, uri); return JSON.stringify(Inventory.resp_existing_blueprint(INV_EXISTING_SERVICE_TYPE)); }); + /* nock(dh.INVENTORY_URL).put(INV_PATH_DCAE_SERVICES + "/" + DEPLOYMENT_ID_JFL_1) .reply(200, function(uri, requestBody) { console.log(action_timer.step, "put", dh.INVENTORY_URL, uri, JSON.stringify(requestBody)); return JSON.stringify(Inventory.resp_put_service(DEPLOYMENT_ID_JFL_1, INV_EXISTING_SERVICE_TYPE)); }); - - nock(dh.CLOUDIFY_URL).put(dh.CLOUDIFY_API + "/blueprints/" + DEPLOYMENT_ID_JFL_1) + */ + nock(dh.CLOUDIFY_URL).get(dh.CLOUDIFY_API + "/blueprints?id=" + "TID-" + INV_EXISTING_SERVICE_TYPE) .reply(200, function(uri, requestBody) { console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); - return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL_1)); + //return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL)); + return JSON.stringify(Cloudify.resp_blueprint("TID-" + INV_EXISTING_SERVICE_TYPE)); + }); + nock(dh.CLOUDIFY_URL).put(dh.CLOUDIFY_API + "/blueprints/" + "TID-" + INV_EXISTING_SERVICE_TYPE + "?visibility=global") + .reply(200, function(uri, requestBody) { + console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); + //return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL_1)); + return JSON.stringify(Cloudify.resp_blueprint("TID-" + INV_EXISTING_SERVICE_TYPE)); }); nock(dh.CLOUDIFY_URL).put(dh.CLOUDIFY_API + "/deployments/" + DEPLOYMENT_ID_JFL_1) .reply(201, function(uri, requestBody) { console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); - return JSON.stringify(Cloudify.resp_deploy(DEPLOYMENT_ID_JFL_1, DEPLOYMENT_ID_JFL_1, message.inputs)); + //return JSON.stringify(Cloudify.resp_deploy(DEPLOYMENT_ID_JFL_1, DEPLOYMENT_ID_JFL_1, message.inputs)); + return JSON.stringify(Cloudify.resp_deploy(DEPLOYMENT_ID_JFL_1, "TID-" + INV_EXISTING_SERVICE_TYPE, message.inputs)); }); nock(dh.CLOUDIFY_URL).get(dh.CLOUDIFY_API + "/executions?deployment_id=" + DEPLOYMENT_ID_JFL_1 + "&workflow_id=create_deployment_environment&_include=id,status") @@ -440,7 +511,7 @@ function test_put_dcae_deployments_creation_failed(dh_server) { expect(res.body).to.have.property('message'); expect(res.body.message).to.be.equal( 'Status 502 from CM API -- error code: UNKNOWN -- message: deployment_id(' - + DEPLOYMENT_ID_JFL_1 + '): deployment creation failed -- no error information'); + + DEPLOYMENT_ID_JFL_1 + '): deployment creation failed -- no error information'); done(); }); }).timeout(50000); @@ -457,32 +528,118 @@ function test_put_dcae_deployments_success(dh_server) { const action_timer = new utils.ActionTimer(); console.log(action_timer.step, test_txt); + /* nock(dh.INVENTORY_URL).get(INV_PATH_DCAE_SERVICES + "/" + DEPLOYMENT_ID_JFL_1) .reply(404, function(uri) { console.log(action_timer.step, "get", dh.INVENTORY_URL, uri); return JSON.stringify(Inventory.resp_not_found_service(DEPLOYMENT_ID_JFL_1)); }); + */ nock(dh.INVENTORY_URL).get(INV_PATH_DCAE_SERVICE_TYPES + INV_EXISTING_SERVICE_TYPE) .reply(200, function(uri) { console.log(action_timer.step, "get", dh.INVENTORY_URL, uri); return JSON.stringify(Inventory.resp_existing_blueprint(INV_EXISTING_SERVICE_TYPE)); }); + /* nock(dh.INVENTORY_URL).put(INV_PATH_DCAE_SERVICES + "/" + DEPLOYMENT_ID_JFL_1) .reply(200, function(uri, requestBody) { console.log(action_timer.step, "put", dh.INVENTORY_URL, uri, JSON.stringify(requestBody)); return JSON.stringify(Inventory.resp_put_service(DEPLOYMENT_ID_JFL_1, INV_EXISTING_SERVICE_TYPE)); }); + */ + nock(dh.CLOUDIFY_URL).get(dh.CLOUDIFY_API + "/blueprints?id=" + "TID-" + INV_EXISTING_SERVICE_TYPE) + .reply(200, function(uri, requestBody) { + console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); + //return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL)); + return JSON.stringify(Cloudify.resp_blueprint("TID-" + INV_EXISTING_SERVICE_TYPE)); + }); + nock(dh.CLOUDIFY_URL).put(dh.CLOUDIFY_API + "/blueprints/" + "TID-" + INV_EXISTING_SERVICE_TYPE + "?visibility=global") + .reply(200, function(uri, requestBody) { + console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); + //return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL_1)); + return JSON.stringify(Cloudify.resp_blueprint("TID-" + INV_EXISTING_SERVICE_TYPE)); + }); + + nock(dh.CLOUDIFY_URL).put(dh.CLOUDIFY_API + "/deployments/" + DEPLOYMENT_ID_JFL_1) + .reply(201, function(uri, requestBody) { + console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); + //return JSON.stringify(Cloudify.resp_deploy(DEPLOYMENT_ID_JFL_1, DEPLOYMENT_ID_JFL_1, message.inputs)); + return JSON.stringify(Cloudify.resp_deploy(DEPLOYMENT_ID_JFL_1, "TID-" + INV_EXISTING_SERVICE_TYPE, message.inputs)); + }); + + nock(dh.CLOUDIFY_URL).get(dh.CLOUDIFY_API + "/executions?deployment_id=" + DEPLOYMENT_ID_JFL_1 + "&workflow_id=create_deployment_environment&_include=id,status") + .reply(200, function(uri) { + console.log(action_timer.step, "get", dh.CLOUDIFY_URL, uri); + return JSON.stringify(Cloudify.resp_dep_creation(DEPLOYMENT_ID_JFL_1, execution_id)); + }); + + nock(dh.CLOUDIFY_URL).post(dh.CLOUDIFY_API + "/executions") + .reply(201, function(uri, requestBody) { + console.log(action_timer.step, "post", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); + return JSON.stringify(Cloudify.resp_execution(DEPLOYMENT_ID_JFL_1, DEPLOYMENT_ID_JFL_1, execution_id)); + }); + + nock(dh.CLOUDIFY_URL).get(dh.CLOUDIFY_API + "/executions/" + execution_id) + .reply(200, function(uri) { + console.log(action_timer.step, "get", dh.CLOUDIFY_URL, uri); + return JSON.stringify(Cloudify.resp_execution(DEPLOYMENT_ID_JFL_1, DEPLOYMENT_ID_JFL_1, execution_id, true)); + }); + + nock(dh.CLOUDIFY_URL).get(dh.CLOUDIFY_API + "/deployments/" + DEPLOYMENT_ID_JFL_1 + "/outputs") + .reply(200, function(uri) { + console.log(action_timer.step, "get", dh.CLOUDIFY_URL, uri); + return JSON.stringify(Cloudify.resp_outputs(DEPLOYMENT_ID_JFL_1)); + }); - nock(dh.CLOUDIFY_URL).put(dh.CLOUDIFY_API + "/blueprints/" + DEPLOYMENT_ID_JFL_1) + return chai.request(dh_server.app).put(req_path) + .set('content-type', 'application/json') + .send(message) + .then(function(res) { + console.log(action_timer.step, "res for", test_txt, res.text); + expect(res).to.have.status(202); + expect(res).to.be.json; + + return utils.sleep(10000); + }) + .then(function() { + console.log(action_timer.step, "the end of test"); + }) + .catch(function(err) { + console.error(action_timer.step, "err for", test_txt, err); + throw err; + }); + }).timeout(50000); + }); +} + +function test_put_dcae_deployments_with_np_bp_upload_success(dh_server) { + const req_path = "/dcae-deployments/" + DEPLOYMENT_ID_JFL_1; + const message = create_main_message(INV_EXISTING_SERVICE_TYPE, true); + const test_txt = "PUT " + req_path + ": " + JSON.stringify(message); + const execution_id = "execution_" + DEPLOYMENT_ID_JFL_1; + describe(test_txt, () => { + it('Success deploy service with no blueprint upload', function() { + const action_timer = new utils.ActionTimer(); + console.log(action_timer.step, test_txt); + + nock(dh.INVENTORY_URL).get(INV_PATH_DCAE_SERVICE_TYPES + INV_EXISTING_SERVICE_TYPE) + .reply(200, function(uri) { + console.log(action_timer.step, "get", dh.INVENTORY_URL, uri); + return JSON.stringify(Inventory.resp_existing_blueprint(INV_EXISTING_SERVICE_TYPE)); + }); + + nock(dh.CLOUDIFY_URL).get(dh.CLOUDIFY_API + "/blueprints?id=" + "TID-" + INV_EXISTING_SERVICE_TYPE) .reply(200, function(uri, requestBody) { console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); - return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL_1)); + //return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL)); + return JSON.stringify(Cloudify.resp_blueprint_exists("TID-" + INV_EXISTING_SERVICE_TYPE)); }); nock(dh.CLOUDIFY_URL).put(dh.CLOUDIFY_API + "/deployments/" + DEPLOYMENT_ID_JFL_1) .reply(201, function(uri, requestBody) { console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); - return JSON.stringify(Cloudify.resp_deploy(DEPLOYMENT_ID_JFL_1, DEPLOYMENT_ID_JFL_1, message.inputs)); + //return JSON.stringify(Cloudify.resp_deploy(DEPLOYMENT_ID_JFL_1, DEPLOYMENT_ID_JFL_1, message.inputs)); + return JSON.stringify(Cloudify.resp_deploy(DEPLOYMENT_ID_JFL_1, "TID-" + INV_EXISTING_SERVICE_TYPE, message.inputs)); }); nock(dh.CLOUDIFY_URL).get(dh.CLOUDIFY_API + "/executions?deployment_id=" + DEPLOYMENT_ID_JFL_1 + "&workflow_id=create_deployment_environment&_include=id,status") @@ -604,34 +761,53 @@ function test_delete_dcae_deployments_success(dh_server) { nock(dh.CLOUDIFY_URL).post(dh.CLOUDIFY_API + "/executions") .reply(201, function(uri, requestBody) { - console.log(action_timer.step, "post", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); - return JSON.stringify(Cloudify.resp_execution(DEPLOYMENT_ID_JFL_1, DEPLOYMENT_ID_JFL_1, - execution_id, false, workflow_id)); - }); - + console.log(action_timer.step, "post", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); + return JSON.stringify(Cloudify.resp_execution(DEPLOYMENT_ID_JFL_1, DEPLOYMENT_ID_JFL_1, + execution_id, false, workflow_id)); + }); + /* nock(dh.INVENTORY_URL).delete(INV_PATH_DCAE_SERVICES + "/" + DEPLOYMENT_ID_JFL_1) .reply(200, function(uri) { console.log(action_timer.step, "delete", dh.INVENTORY_URL, uri); return ""; }); - + */ nock(dh.CLOUDIFY_URL).get(dh.CLOUDIFY_API + "/executions/" + execution_id) .reply(200, function(uri) { - console.log(action_timer.step, "get", dh.CLOUDIFY_URL, uri); - return JSON.stringify(Cloudify.resp_execution(DEPLOYMENT_ID_JFL_1, DEPLOYMENT_ID_JFL_1, - execution_id, true, workflow_id)); - }); - + console.log(action_timer.step, "get", dh.CLOUDIFY_URL, uri); + return JSON.stringify(Cloudify.resp_execution(DEPLOYMENT_ID_JFL_1, DEPLOYMENT_ID_JFL_1, + execution_id, true, workflow_id)); + }); + nock(dh.CLOUDIFY_URL).get(dh.CLOUDIFY_API + "/deployments/" + DEPLOYMENT_ID_JFL_1 + "?_include=blueprint_id") + .reply(200, function(uri, requestBody) { + console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); + //return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL)); + return JSON.stringify(Cloudify.resp_blueprint_id("TID-" + INV_EXISTING_SERVICE_TYPE)); + }); nock(dh.CLOUDIFY_URL).delete(dh.CLOUDIFY_API + "/deployments/" + DEPLOYMENT_ID_JFL_1) .reply(201, function(uri) { console.log(action_timer.step, "delete", dh.CLOUDIFY_URL, uri); - return JSON.stringify(Cloudify.resp_deploy(DEPLOYMENT_ID_JFL_1, DEPLOYMENT_ID_JFL_1)); + //return JSON.stringify(Cloudify.resp_deploy(DEPLOYMENT_ID_JFL_1, DEPLOYMENT_ID_JFL_1)); + return JSON.stringify(Cloudify.resp_deploy(DEPLOYMENT_ID_JFL_1, "TID-" + INV_EXISTING_SERVICE_TYPE)); }); - - nock(dh.CLOUDIFY_URL).delete(dh.CLOUDIFY_API + "/blueprints/" + DEPLOYMENT_ID_JFL_1) + nock(dh.CLOUDIFY_URL).get(dh.CLOUDIFY_API + "/deployments?blueprint_id=" + "TID-" + INV_EXISTING_SERVICE_TYPE + + "&_all_tenants=true&_include=id") + .reply(200, function(uri, requestBody) { + console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); + //return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL)); + return true; + }); + nock(dh.CLOUDIFY_URL).get(dh.CLOUDIFY_API + "/blueprints?id=" + "TID-" + INV_EXISTING_SERVICE_TYPE + "&_include=tenant_name") + .reply(200, function(uri, requestBody) { + console.log(action_timer.step, "put", dh.CLOUDIFY_URL, uri, JSON.stringify(requestBody)); + //return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL)); + return JSON.stringify(Cloudify.resp_blueprint_tenant_name("TID-" + INV_EXISTING_SERVICE_TYPE)); + }); + nock(dh.CLOUDIFY_URL).delete(dh.CLOUDIFY_API + "/blueprints/" + "TID-" + INV_EXISTING_SERVICE_TYPE) .reply(200, function(uri) { console.log(action_timer.step, "delete", dh.CLOUDIFY_URL, uri); - return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL_1)); + //return JSON.stringify(Cloudify.resp_blueprint(DEPLOYMENT_ID_JFL_1)); + return JSON.stringify(Cloudify.resp_blueprint("TID-" + INV_EXISTING_SERVICE_TYPE)); }); return chai.request(dh_server.app).delete(req_path) @@ -705,12 +881,12 @@ function test_zipper(dh_server) { throw first_exc; } }) - .catch(function(e) { - const error = "test of zipper exiting due to test problem: " + e.message - + " " + (e.stack || "").replace(/\n/g, " ") + "blueprint(" + e.blueprint + ")"; - console.error(error); - throw e; - }); + .catch(function(e) { + const error = "test of zipper exiting due to test problem: " + e.message + + " " + (e.stack || "").replace(/\n/g, " ") + "blueprint(" + e.blueprint + ")"; + console.error(error); + throw e; + }); }); }); } @@ -718,13 +894,14 @@ function test_zipper(dh_server) { dh.add_tests([ test_zipper, - test_get_dcae_deployments, - test_get_dcae_deployments_service_type_unknown, + //test_get_dcae_deployments, + //test_get_dcae_deployments_service_type_unknown, test_put_dcae_deployments_i_dont_know, test_put_dcae_deployments_missing_input_error, test_get_dcae_deployments_operation, - test_get_dcae_deployments_service_type_deployed, + //test_get_dcae_deployments_service_type_deployed, test_put_dcae_deployments_creation_failed, test_put_dcae_deployments_success, + test_put_dcae_deployments_with_np_bp_upload_success, test_delete_dcae_deployments_success ]); diff --git a/tests/test_policy.js b/tests/test_policy.js index b98c401..8214197 100644 --- a/tests/test_policy.js +++ b/tests/test_policy.js @@ -220,8 +220,8 @@ function nock_cfy_node_instances(action_timer) { return nock(dh.CLOUDIFY_URL).get(CFY_API_NODE_INSTANCES) .query(params => { console.log(action_timer.step, "get", dh.CLOUDIFY_URL, CFY_API_NODE_INSTANCES, JSON.stringify(params)); - return !!(params._include === "id,deployment_id,runtime_properties" - && params._size === "1000" && params._offset === "0"); + //return !!(params._include === "id,deployment_id,runtime_properties" + return !!(params._size === "1000" && params._offset === "0"); }) .reply(200, function(uri) { console.log(action_timer.step, "get", dh.CLOUDIFY_URL, uri); diff --git a/version.properties b/version.properties index 2a2fd1c..509d1ca 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ major=4 -minor=3 +minor=4 patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} |