diff options
author | Jozsef Csongvai <jozsef.csongvai@bell.ca> | 2021-07-26 12:00:59 -0400 |
---|---|---|
committer | Jozsef Csongvai <jozsef.csongvai@bell.ca> | 2021-07-28 09:06:26 -0400 |
commit | 45263f50896a7021cd17d78ce83b29365cb19c29 (patch) | |
tree | 0245881b0c3badd2e72144dc29311f4e7df58e38 /cds-ui/server | |
parent | 76cb04c2302c9f8f0395f86d8e8d246fdae0fd28 (diff) |
Revert "Renaming Files having BluePrint to have Blueprint"1.1.5
The renaming in CCSDK-3098 caused breaking changes to the grpc api and
compile issues for kotlin scripts.
Issue-ID: CCSDK-3385
Change-Id: I0d745cb858371678eabcb2284671c1fd76a1ab6d
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Diffstat (limited to 'cds-ui/server')
5 files changed, 12 insertions, 12 deletions
diff --git a/cds-ui/server/src/clients/blueprint-management-service-grpc-client.ts b/cds-ui/server/src/clients/blueprint-management-service-grpc-client.ts index b54a1d10c..8975f4501 100644 --- a/cds-ui/server/src/clients/blueprint-management-service-grpc-client.ts +++ b/cds-ui/server/src/clients/blueprint-management-service-grpc-client.ts @@ -35,14 +35,14 @@ const packageDefinition: protoLoader.PackageDefinition = protoLoader.loadSync( const protoDescriptor = grpc.loadPackageDefinition(packageDefinition); // The protoDescriptor object has the full package hierarchy -const stub = new protoDescriptor.org.onap.ccsdk.cds.controllerblueprints.management.api.BlueprintManagementService( +const stub = new protoDescriptor.org.onap.ccsdk.cds.controllerblueprints.management.api.BluePrintManagementService( "" + processorApiConfig.grpc.host + ":" + processorApiConfig.grpc.port + "", grpc.credentials.createInsecure()); const metadata = new grpc.Metadata(); metadata.add('Authorization', processorApiConfig.grpc.authToken); -class BlueprintManagementServiceGrpcClient { +class BluePrintManagementServiceGrpcClient { async uploadBlueprint(filePath: string, actionName: string): Promise<any> { @@ -115,5 +115,5 @@ class BlueprintManagementServiceGrpcClient { } } -export const bluePrintManagementServiceGrpcClient = new BlueprintManagementServiceGrpcClient(); +export const bluePrintManagementServiceGrpcClient = new BluePrintManagementServiceGrpcClient(); diff --git a/cds-ui/server/src/config/app-config.ts b/cds-ui/server/src/config/app-config.ts index 68bb74ce0..5b4a6ec54 100644 --- a/cds-ui/server/src/config/app-config.ts +++ b/cds-ui/server/src/config/app-config.ts @@ -39,7 +39,7 @@ export const processorApiConfig = Object.freeze({ authToken: process.env.API_BLUEPRINT_PROCESSOR_GRPC_AUTH_TOKEN || "Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==", bluePrintManagement: Object.freeze({ //this path is relative to 'dist' folder - protoPath: __dirname + '../../../proto/BlueprintManagement.proto' + protoPath: __dirname + '../../../proto/BluePrintManagement.proto' }) }) }); diff --git a/cds-ui/server/src/controllers/blueprint-rest.controller.ts b/cds-ui/server/src/controllers/blueprint-rest.controller.ts index 3bbb7f631..a8b989ff4 100644 --- a/cds-ui/server/src/controllers/blueprint-rest.controller.ts +++ b/cds-ui/server/src/controllers/blueprint-rest.controller.ts @@ -58,8 +58,8 @@ export class BlueprintRestController { }, }, }) - async getOneBlueprint(@param.path.string('id') id: string) { - return await this.bpservice.getOneBlueprint(id); + async getOneBluePrint(@param.path.string('id') id: string) { + return await this.bpservice.getOneBluePrint(id); } @del('/controllerblueprint/{id}', { @@ -70,8 +70,8 @@ export class BlueprintRestController { }, }, }) - async deleteBlueprint(@param.path.string('id') id: string) { - return await this.bpservice.deleteBlueprint(id); + async deleteBluePrint(@param.path.string('id') id: string) { + return await this.bpservice.deleteBluePrint(id); } diff --git a/cds-ui/server/src/datasources/blueprint.datasource-template.ts b/cds-ui/server/src/datasources/blueprint.datasource-template.ts index e2bf58295..dc1cd3734 100644 --- a/cds-ui/server/src/datasources/blueprint.datasource-template.ts +++ b/cds-ui/server/src/datasources/blueprint.datasource-template.ts @@ -33,7 +33,7 @@ export default { "responsePath": "$.*" }, "functions": { - "getOneBlueprint": ["id"] + "getOneBluePrint": ["id"] } }, @@ -49,7 +49,7 @@ export default { "responsePath": "$.*" }, "functions": { - "deleteBlueprint": ["id"] + "deleteBluePrint": ["id"] } }, diff --git a/cds-ui/server/src/services/blueprint.service.ts b/cds-ui/server/src/services/blueprint.service.ts index 433301175..a017e6ef2 100644 --- a/cds-ui/server/src/services/blueprint.service.ts +++ b/cds-ui/server/src/services/blueprint.service.ts @@ -3,8 +3,8 @@ import { inject, Provider } from '@loopback/core'; import { BlueprintDataSource } from '../datasources'; export interface BlueprintService { - getOneBlueprint(id: string): any; - deleteBlueprint(id: string): any; + getOneBluePrint(id: string): any; + deleteBluePrint(id: string): any; getAllblueprints(): Promise<any>; getBlueprintsByKeyword(keyword: string): Promise<any>; getByTags(tags: string): Promise<JSON>; |