summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShaabanEltanany <shaaban.eltanany.ext@orange.com>2020-09-14 15:59:39 +0200
committerShaabanEltanany <shaaban.eltanany.ext@orange.com>2020-09-14 15:59:39 +0200
commit992af3704682c5bc74873ca23cb39862a697f486 (patch)
tree14a3bf10547f2d9773bd325776f21ccccbe17c5a
parented5ccd2c544eb0da85342bc64308363997b3747f (diff)
adding deploy feature
Issue-ID: CCSDK-2299 Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com> Change-Id: I1b4ac4d12d18371cd4db9226ca8cbd215f01b3b3
-rw-r--r--cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts7
-rw-r--r--cds-ui/server/src/controllers/blueprint-rest.controller.ts2
2 files changed, 5 insertions, 4 deletions
diff --git a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
index 09434bc17..8639b1550 100644
--- a/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
+++ b/cds-ui/designer-client/src/app/modules/feature-modules/packages/configuration-dashboard/configuration-dashboard.component.ts
@@ -312,9 +312,10 @@ export class ConfigurationDashboardComponent extends ComponentCanDeactivate impl
this.create();
this.zipFile.generateAsync({type: 'blob'})
.then(blob => {
- this.packageCreationService.enrichPackage(blob).subscribe(response => {
- console.log('success');
- console.log(response);
+ this.packageCreationService.deploy(blob).subscribe(response => {
+ this.toastService.info('deployed successfully ');
+ const id = response.toString().split('id')[1].split(':')[1].split('"')[1];
+ this.router.navigate(['/packages/package/' + id]);
});
}, error => {
this.toastService.error('error happened when deploying ' + error.message);
diff --git a/cds-ui/server/src/controllers/blueprint-rest.controller.ts b/cds-ui/server/src/controllers/blueprint-rest.controller.ts
index 870f9793f..91d7e66e3 100644
--- a/cds-ui/server/src/controllers/blueprint-rest.controller.ts
+++ b/cds-ui/server/src/controllers/blueprint-rest.controller.ts
@@ -307,7 +307,7 @@ export class BlueprintRestController {
if (appConfig.action.grpcEnabled)
return this.uploadFileToBlueprintProcessorGrpc(file, 'PUBLISH', response);
else
- return this.uploadFileToBlueprintProcessor(file, '/execution-service/upload/', response);
+ return this.uploadFileToBlueprintProcessor(file, '/blueprint-model/publish', response);
}, err => {
reject(err);
});