Changed CBA download with name and version

Change-Id: I6121e6248138569b2bb0908bb99d9059a1115784
Issue-ID: CCSDK-1068
Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>

diff --git a/cds-ui/server/src/controllers/blueprint-rest.controller.ts b/cds-ui/server/src/controllers/blueprint-rest.controller.ts
index c630ce0..c1f7f96 100644 (file)
--- a/cds-ui/server/src/controllers/blueprint-rest.controller.ts
+++ b/cds-ui/server/src/controllers/blueprint-rest.controller.ts
@@ -135,14 +135,15 @@ export class BlueprintRestController {
     });
   }
 
-  @get('/download-blueprint/{id}')
+  @get('/download-blueprint/{name}/{version}')
   async download(
-    @param.path.string('id') id: string,
-    @inject(RestBindings.Http.REQUEST) request: Request,
+    @param.path.string('name') name: string,
+    @param.path.string('version') version:string,
+    // @inject(RestBindings.Http.REQUEST) request: Request,
     @inject(RestBindings.Http.RESPONSE) response: Response,
   ): Promise<any> {
     return new Promise((resolve, reject) => { 
-      this.downloadFileFromBlueprintController("/blueprint-model/download/" + id).then(resp=>{
+      this.downloadFileFromBlueprintController("/blueprint-model/download/by-name/"+name+"/version/"+version).then(resp=>{
         response.setHeader("X-ONAP-RequestID", resp.headers['x-onap-requestid']);
         response.setHeader("Content-Disposition", resp.headers['content-disposition']);
         resolve(resp.body);

diff --git a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
index fc148bf..0e2cdf9 100755 (executable)
--- a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
+++ b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
@@ -18,10 +18,10 @@
 #logging.level.web=DEBUG\r
 \r
 # Web server config\r
-server.port=8080\r
+server.port=8081\r
 \r
 blueprintsprocessor.grpcEnable=false\r
-blueprintsprocessor.httpPort=8080\r
+blueprintsprocessor.httpPort=8081\r
 blueprintsprocessor.grpcPort=9111\r
 \r
 # Blueprint Processor File Execution and Handling Properties\r