diff options
| author |   KAPIL SINGAL <ks220y@att.com> | 2020-12-02 21:50:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-12-02 21:50:18 +0000 |
| commit | 1418d68510fe7d7bb59789f35cfdc94bcb57a72e (patch) | |
| tree | 9ac78c0cb048f501a67edcda577f597a71040588 /ms/blueprintsprocessor | |
| parent | ee01e433cb623d2cbcdc8b61a10bd455f698c980 (diff) | |
| parent | 9c1e9636d89ab4d5f15a27d1257237b222a7b858 (diff) | |
Merge "CDS Fix Swagger issues"
Diffstat (limited to 'ms/blueprintsprocessor')
4 files changed, 4 insertions, 3 deletions
diff --git a/ms/blueprintsprocessor/functions/config-snapshots/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/config/snapshots/db/ResourceConfigSnapshot.kt b/ms/blueprintsprocessor/functions/config-snapshots/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/config/snapshots/db/ResourceConfigSnapshot.kt index 31d84e60d..7df5ea144 100644 --- a/ms/blueprintsprocessor/functions/config-snapshots/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/config/snapshots/db/ResourceConfigSnapshot.kt +++ b/ms/blueprintsprocessor/functions/config-snapshots/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/config/snapshots/db/ResourceConfigSnapshot.kt @@ -46,7 +46,7 @@ import javax.persistence.TemporalType @Proxy(lazy = false) class ResourceConfigSnapshot : Serializable { - @get:ApiModelProperty(value = "Resource type.", required = true, example = "ServiceInstance, VfModule, VNF, PNF") + @get:ApiModelProperty(value = "Resource type.", required = true, example = "\"ServiceInstance\"") @Column(name = "resource_type", nullable = false) var resourceType: String? = null diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolution.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolution.kt index 55a4d1120..8f3e5175e 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolution.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/ResourceResolution.kt @@ -70,7 +70,7 @@ class ResourceResolution : Serializable { @Column(name = "resolution_key", nullable = false) var resolutionKey: String? = null - @get:ApiModelProperty(value = "Resolution type.", required = true, example = "ServiceInstance, VfModule, VNF") + @get:ApiModelProperty(value = "Resolution type.", required = true, example = "\"ServiceInstance\"") @Column(name = "resource_type", nullable = false) var resourceType: String? = null diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt index 971caa338..a53e901fd 100755 --- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt +++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/db/TemplateResolution.kt @@ -62,7 +62,7 @@ class TemplateResolution : Serializable { @Column(name = "resolution_key", nullable = false) var resolutionKey: String? = null - @get:ApiModelProperty(value = "Resolution type.", required = true, example = "ServiceInstance, VfModule, VNF") + @get:ApiModelProperty(value = "Resolution type.", required = true, example = "\"ServiceInstance\"") @Column(name = "resource_type", nullable = false) var resourceType: String? = null diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelController.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelController.kt index 0de298c62..0fadec30c 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelController.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/BlueprintModelController.kt @@ -223,6 +223,7 @@ open class BlueprintModelController(private val bluePrintModelHandler: BluePrint @ApiOperation( value = "Delete a CBA", notes = "Delete the CBA package identified by its name and version.", + nickname = "BlueprintModelController_deleteBlueprint_1_DELETE.org.onap.ccsdk.cds.blueprintsprocessor.designer.api", produces = MediaType.APPLICATION_JSON_VALUE ) @PreAuthorize("hasRole('USER')") |