diff options
4 files changed, 35 insertions, 35 deletions
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema-1.1.yaml index 7e2dda79..44e4651d 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema-1.1.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema-1.1.yaml @@ -35,35 +35,35 @@ parameters: short_option: b is_optional: true default_value: resourceNewCategory.generic.abstract - - name: vsp-license-version + - name: vlm-version description: License version type: string - long_option: vsp-license-version + long_option: vlm-version short_option: c is_optional: true default_value: 1.0 - - name: vsp-vendor-name - description: License Model Name + - name: vlm-vendor + description: License Model vendor type: string - long_option: vsp-vendor-name + long_option: vlm-vendor short_option: e is_optional: false - - name: vsp-vendor-id + - name: vlm-id description: License Model ID type: string - long_option: vsp-vendor-id + long_option: vlm-id short_option: g is_optional: false - - name: license-agreement-id + - name: vlm-agreement-id description: License Agreement ID type: string - long_option: license-agreement-id + long_option: vlm-agreement-id short_option: i is_optional: false - - name: feature-group-id + - name: vlm-feature-group-id description: Feature Group ID type: string - long_option: feature-group-id + long_option: vlm-feature-group-id short_option: j is_optional: false results: @@ -77,7 +77,7 @@ http: request: uri: /onboarding-api/v1.0/vendor-software-products method: POST - body: '{"category": "${vsp-category}", "vendorId": "${vsp-vendor-id}", "subCategory": "${vsp-subcategory}", "description": "${vsp-description}", "licensingVersion": {"id": "${vsp-license-version}", "label": "${vsp-license-version}"}, "licensingData": {"featureGroups": ["${feature-group-id}"], "licenseAgreement": "${license-agreement-id}"}, "icon": "icon", "onboardingMethod": "NetworkPackage", "vendorName": "${vsp-vendor-name}", "name": "${vsp-name}"}' + body: '{"category": "${vsp-category}", "vendorId": "${vlm-id}", "subCategory": "${vsp-subcategory}", "description": "${vsp-description}", "licensingVersion": {"id": "${vlm-version}", "label": "${vlm-version}"}, "licensingData": {"featureGroups": ["${vlm-feature-group-id}"], "licenseAgreement": "${vlm-agreement-id}"}, "icon": "icon", "onboardingMethod": "NetworkPackage", "vendorName": "${vlm-vendor}", "name": "${vsp-name}"}' success_codes: - 200 result_map: diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml index 58da2a43..bdc77563 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml @@ -33,31 +33,31 @@ parameters: long_option: vsp-subcategory is_optional: true default_value: resourceNewCategory.generic.abstract - - name: vsp-license-version + - name: vlm-version description: License version type: string - long_option: vsp-license-version + long_option: vlm-version is_optional: true default_value: 1.0 - - name: vsp-vendor-name + - name: vlm-vendor description: License Model Name type: string - long_option: vsp-vendor-name + long_option: vlm-vendor is_optional: false - - name: vsp-vendor-id + - name: vlm-id description: License Model ID type: string - long_option: vsp-vendor-id + long_option: vlm-id is_optional: false - - name: license-agreement-id + - name: vlm-agreement-id description: License Agreement ID type: string - long_option: license-agreement-id + long_option: vlm-agreement-id is_optional: false - - name: feature-group-id + - name: vlm-feature-group-id description: Feature Group ID type: string - long_option: feature-group-id + long_option: vlm-feature-group-id is_optional: false results: direction: portrait @@ -70,7 +70,7 @@ http: request: uri: /onboarding-api/v1.0/vendor-software-products method: POST - body: '{"name": "${vsp-name}", "description": "${vsp-description}", "category": "${vsp-category}", "subCategory": "${vsp-subcategory}", "licensingVersion": "${vsp-license-version}", "vendorName": "${vsp-vendor-name}", "vendorId": "${vsp-vendor-id}", "icon": "icon", "licensingData": { "licenseAgreement": "${license-agreement-id}", "featureGroups": [ "${feature-group-id}" ]}}' + body: '{"name": "${vsp-name}", "description": "${vsp-description}", "category": "${vsp-category}", "subCategory": "${vsp-subcategory}", "licensingVersion": "${vlm-version}", "vendorName": "${vlm-vendor}", "vendorId": "${vlm-id}", "icon": "icon", "licensingData": { "licenseAgreement": "${vlm-agreement-id}", "featureGroups": [ "${vlm-feature-group-id}" ]}}' success_codes: - 200 result_map: diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-moco.json index 6e7253f9..0a9b516c 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-moco.json +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-moco.json @@ -7,32 +7,32 @@ "X-FromAppId" : "onap-cli", "Accept" : "application/json", "USER_ID" : "cs0008", - "X-TransactionId" : "req-aa703f95-a8ab-4c5c-8971-40e73df98a28", + "X-TransactionId" : "req-d12d57b4-de08-481f-9235-f524e3b7aa99", "Content-Type" : "application/json" }, "json" : { "category" : "resourceNewCategory.generic", - "vendorId" : "b1caa2ec31ba4b738cbe5aab362b35aa", + "vendorId" : "cf2d907d998e44698ce3b4cded5f66a7", "subCategory" : "resourceNewCategory.generic.abstract", - "description" : "VSP created from CLI for vFW", + "description" : "VLB created from CLI", "licensingVersion" : { - "id" : "4.0", - "label" : "4.0" + "id" : "2.0", + "label" : "2.0" }, "licensingData" : { - "featureGroups" : [ "efea8b9817b344c4b93c45dc141f6703" ], - "licenseAgreement" : "b373c16f28854c6db9e027929ae5e5ed" + "featureGroups" : [ "3a2fb75b52a54e9c8093e7c154210f9e" ], + "licenseAgreement" : "77e151d0503b45ecb7e40f5f5f1a887e" }, "icon" : "icon", "onboardingMethod" : "NetworkPackage", - "vendorName" : "Kanag", - "name" : "kanag-cli-vfw" + "vendorName" : "Kanag-cli", + "name" : "kanag-cli-VLB" } }, "response" : { "status" : 200, "json" : { - "vspId" : "5ca119e2326045d1857ae3f04a816434" + "vspId" : "f19cad8343794e93acb9cda2e4126281" } } } ]
\ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml index 69783a0d..41a78125 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml @@ -4,11 +4,11 @@ version: onap-1.1 samples: sample1: name: vsp-create - input: --vsp-name kanag-cli-vfw --vsp-description VSP created from CLI for vFW --vsp-vendor-name Kanag --vsp-vendor-id b1caa2ec31ba4b738cbe5aab362b35aa --license-agreement-id b373c16f28854c6db9e027929ae5e5ed --feature-group-id efea8b9817b344c4b93c45dc141f6703 -d --vsp-license-version 4.0 + input: --vsp-name kanag-cli-VLB --vsp-description VLB created from CLI --vlm-agreement-id 77e151d0503b45ecb7e40f5f5f1a887e --vlm-version 2.0 --vlm-feature-group-id 3a2fb75b52a54e9c8093e7c154210f9e --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-vendor Kanag-cli moco: vsp-create-schema-1.1-moco.json ouput: | +----------+----------------------------------+ |property |value | +----------+----------------------------------+ - |ID |5ca119e2326045d1857ae3f04a816434 | + |ID |f19cad8343794e93acb9cda2e4126281 | +----------+----------------------------------+ |