diff options
26 files changed, 74 insertions, 52 deletions
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml index 41f7a63e..3bebdae1 100644 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml +++ b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: ems-list input: moco: ems-list-schema-1.1-moco.json - ouput:| + ouput: | +--------------------------------------+------------------+ |ems-id |resource-version | +--------------------------------------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml index cc084b0d..df61b35f 100644 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml +++ b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: ems-show input: --ems-id 51a480ed-649c-4c47-a84b-f966dc4f9554 moco: ems-show-schema-1.1-moco.json - ouput:| + ouput: | +------+------+--------+----------+------------------+ |name |type |vendor |version |url | +------+------+--------+----------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml index d679604f..e8c18ff5 100644 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml +++ b/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: vim-list input: --cloud-name huawei-cloud --region-name bangalore --long moco: vim-list-schema-1.1-moco.json - ouput:| + ouput: | +--------------------------------------+------------+------------+----------+----------+--------------------------------+----------+--------------+----------------+------------------+ |vim-id |name |type |vendor |version |url |username |cloud-domain |default-tenant |resource-version | +--------------------------------------+------------+------------+----------+----------+--------------------------------+----------+--------------+----------------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml index fc26a107..b23463c4 100644 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml +++ b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: vnfm-list input: moco: vnfm-list-schema-1.1-moco.json - ouput:| + ouput: | +--------------------------------------+--------------------------------------+------------------+------------------+ |vnfm-id |vim-id |certificate-url |resource-version | +--------------------------------------+--------------------------------------+------------------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml index 93b09e8b..7d9a9e1a 100644 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml +++ b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: vnfm-show input: --vnfm-id c0ecd788-22f4-49a4-a969-68051cd517e7 moco: vnfm-show-schema-1.1-moco.json - ouput:| + ouput: | +----------+------------------+ |property |value | +----------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml index d4c17de5..7b74feec 100644 --- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml +++ b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: subscription-list input: --customer-name kanag moco: subscription-list-schema-1.1-moco.json - ouput:| + ouput: | +--------------+------------------+ |service-type |resource-version | +--------------+------------------+ diff --git a/plugins/msb/src/test/resources/onap-cli-sample/microservice-create-schema-sample.yaml b/plugins/msb/src/test/resources/onap-cli-sample/microservice-create-schema-sample.yaml index f11b3bfb..d2302272 100644 --- a/plugins/msb/src/test/resources/onap-cli-sample/microservice-create-schema-sample.yaml +++ b/plugins/msb/src/test/resources/onap-cli-sample/microservice-create-schema-sample.yaml @@ -6,7 +6,7 @@ samples: name: microservice-create input: --service-name test --service-version v1 --service-url C:/Git/test --path C:/Git/test 10.0.0.1 8080 moco: microservice-create-schema-moco.json - ouput:| + ouput: | +----------+--------------+ |property |value | +----------+--------------+ diff --git a/plugins/msb/src/test/resources/onap-cli-sample/microservice-list-schema-sample.yaml b/plugins/msb/src/test/resources/onap-cli-sample/microservice-list-schema-sample.yaml index c7692a4b..dc57e7f4 100644 --- a/plugins/msb/src/test/resources/onap-cli-sample/microservice-list-schema-sample.yaml +++ b/plugins/msb/src/test/resources/onap-cli-sample/microservice-list-schema-sample.yaml @@ -6,7 +6,7 @@ samples: name: microservice-list input: --long moco: microservice-list-schema-moco.json - ouput:| + ouput: | +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+ |name |version |url |status |nodes |enable-ssl |path | +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+ diff --git a/plugins/msb/src/test/resources/onap-cli-sample/microservice-show-schema-sample.yaml b/plugins/msb/src/test/resources/onap-cli-sample/microservice-show-schema-sample.yaml index b3f659a4..b1c7930e 100644 --- a/plugins/msb/src/test/resources/onap-cli-sample/microservice-show-schema-sample.yaml +++ b/plugins/msb/src/test/resources/onap-cli-sample/microservice-show-schema-sample.yaml @@ -6,7 +6,7 @@ samples: name: microservice-show input: --service-name test --service-version v1 --long moco: microservice-show-schema-moco.json - ouput:| + ouput: | +------------+----------------+ |property |value | +------------+----------------+ diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-list-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-list-schema-1.1.yaml index e43ff9c8..8ad3656e 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-list-schema-1.1.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-list-schema-1.1.yaml @@ -35,7 +35,14 @@ results: description: description type: string scope: long - + - name: vsp-uuid + description: VSP uuid + type: string + scope: long + - name: vsp-version + description: VSP version + type: string + scope: long http: request: uri: /sdc2/rest/v1/followed @@ -49,4 +56,5 @@ http: name: $b{resources.[*].name} status: $b{resources.[*].lifecycleState} description: $b{resources.[*].description} - + vsp-uuid: $b{resources.[*].csarUUID} + vsp-version: $b{resources.[*].csarVersion} diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml index a4092d41..a138363f 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml @@ -19,6 +19,14 @@ parameters: results: direction: landscape attributes: + - name: vsp-uuid + description: VSP uuid + type: string + scope: short + - name: vsp-version + description: VSP version + type: string + scope: short - name: module-uuid description: UUID type: string @@ -47,3 +55,5 @@ http: module-name: $b{groups.[?(@.type == 'org.openecomp.groups.VfModule')].name} module-version: $b{groups.[?(@.type == 'org.openecomp.groups.VfModule')].version} module-invariant-uuid: $b{groups.[?(@.type == 'org.openecomp.groups.VfModule')].invariantUUID} + vsp-uuid: $b{$.csarUUID} + vsp-version: $b{$.csarVersion}
\ No newline at end of file diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml index 8f7d239d..a9aa8100 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml @@ -35,6 +35,10 @@ results: description: license aggreement scope: long type: string + - name: license-version + description: license version + scope: long + type: string http: request: uri: /onboarding-api/v1.0/vendor-software-products @@ -48,5 +52,4 @@ http: version: $b{results.[*].version.id} status: $b{results.[*].status} license-id: $b{results.[*].licensingData.licenseAgreement} - sample_response: - body: '{"results":[{"name":"test-vsp1","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"354BF3E32E494EAFBB15037CFAB262FF","version":"0.1","viewableVersions":["0.1"],"status":"Locked","lockingUser":"cs0008"},{"name":"test-vsp","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"2DEB6CB4B082415BB7A697C9CD1273BA","version":"1.0","viewableVersions":["1.0"],"finalVersions":["1.0"],"status":"Final"}],"listCount":2}' + license-version: $b{results.[*].licensingVersion.id} diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml index e64d4efc..aa614e1b 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: service-model-list input: --long moco: service-model-list-schema-1.1-moco.json - ouput:| + ouput: | +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+------------------------------+ |uuid |invariant-uuid |name |version |status |distribution-status |description | +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+------------------------------+ diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml index b4298574..294520b0 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: service2vf-model-list input: --service-model-id 0f4203a8-a314-47bb-9a7d-28157652cec4 moco: service2vf-model-list-schema-1.1-moco.json - ouput:| + ouput: | +--------------------------------------+--------------------------+--------------------------------------+------------+ |vf-uuid |vf-name |vf-customization-uuid |vf-version | +--------------------------------------+--------------------------+--------------------------------------+------------+ diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-moco.json index 8b19a3c0..0e616302 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-moco.json +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-moco.json @@ -7,7 +7,7 @@ "X-FromAppId" : "onap-cli", "Accept" : "application/json", "USER_ID" : "cs0008", - "X-TransactionId" : "req-60f8b79d-2d54-4f76-a004-1de0a5f42deb", + "X-TransactionId" : "req-49876ad8-7b10-4273-8ece-853e4f773dd6", "Content-Type" : "application/json" }, "json" : null diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml index ade0d8bd..ce3ddf7f 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml @@ -4,25 +4,25 @@ version: onap-1.1 samples: sample1: name: vf-model-list - input: --long + input: moco: vf-model-list-schema-1.1-moco.json ouput:| - +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+ - |uuid |invariant-uuid |name |version |status |description | - +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+ - |dac5b070-e53b-44b3-8034-46c9cf797de3 |d3d50449-a81a-497f-97b3-4eb770ea67e7 |Kanag-VSP |1.0 |CERTIFIED |Test VSP created by Kanag | - +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+ - |047b9ff8-2414-45b7-b753-26342369f160 |cc34cd54-dd7c-44cd-8847-f9577c6f1a49 |847cb26a-59a6-475a-94dd |1.0 |CERTIFIED |vendor software product | - +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+ - |6e29f979-6f36-4c0d-8605-e59da8d62cb7 |1bd7f899-01dc-4d7f-97d8-f38ba6b40dd9 |74361ede-ef8c-43f1-9d82 |1.0 |CERTIFIED |vendor software product | - +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+ - |3a3fb778-1c0e-41a1-9a04-f7ddaaf93d73 |414da4ea-e482-4ed2-9941-bd90108376fa |136ab241-88ff-443a-88e8 |1.0 |CERTIFIED |vendor software product | - +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+ - |f4be1629-c9a1-4f32-8f34-11eddabffc13 |7fd3788f-a065-4270-bb95-852eae3a94b3 |ef35d3c9-a8c6-457c-a115 |1.0 |CERTIFIED |vendor software product | - +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+ - |13d537e4-86c9-4437-88a4-e21f135335bb |d3d50449-a81a-497f-97b3-4eb770ea67e7 |Kanag-VSP |1.1 |NOT_CERTIFIED_CHECKOUT |Test VSP created by Kanag | - +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+ - |372e2c66-ee59-4488-a6a6-546c28b3a151 |244b380b-acf1-4545-8d35-d6d01bc32fd6 |5d11dda4-fb32-4df6-86eb |1.0 |CERTIFIED |vendor software product | - +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+ - |23018f7f-fbce-479e-a77b-6b98ebf03266 |6bc22345-395d-4358-8954-45963761f968 |8fd2e5c8-981d-4a14-ba77 |1.0 |CERTIFIED |vendor software product | - +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------+ + +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+ + |uuid |invariant-uuid |name |version |status |vsp-uuid |vsp-version | + +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+ + |dac5b070-e53b-44b3-8034-46c9cf797de3 |d3d50449-a81a-497f-97b3-4eb770ea67e7 |Kanag-VSP |1.0 |CERTIFIED |b1caa2ec31ba4b738cbe5aab362b35aa |1.0 | + +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+ + |047b9ff8-2414-45b7-b753-26342369f160 |cc34cd54-dd7c-44cd-8847-f9577c6f1a49 |847cb26a-59a6-475a-94dd |1.0 |CERTIFIED |a8cd007fa101470e98516cd4549c568f |1.0 | + +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+ + |6e29f979-6f36-4c0d-8605-e59da8d62cb7 |1bd7f899-01dc-4d7f-97d8-f38ba6b40dd9 |74361ede-ef8c-43f1-9d82 |1.0 |CERTIFIED |c212437049004e74b4ef0afb25ba41b8 |1.0 | + +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+ + |3a3fb778-1c0e-41a1-9a04-f7ddaaf93d73 |414da4ea-e482-4ed2-9941-bd90108376fa |136ab241-88ff-443a-88e8 |1.0 |CERTIFIED |5f5121f701df4fe588c966002a342fdf |1.0 | + +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+ + |f4be1629-c9a1-4f32-8f34-11eddabffc13 |7fd3788f-a065-4270-bb95-852eae3a94b3 |ef35d3c9-a8c6-457c-a115 |1.0 |CERTIFIED |03774c7cfcac4054bdab346142214533 |1.0 | + +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+ + |13d537e4-86c9-4437-88a4-e21f135335bb |d3d50449-a81a-497f-97b3-4eb770ea67e7 |Kanag-VSP |1.1 |NOT_CERTIFIED_CHECKOUT |b1caa2ec31ba4b738cbe5aab362b35aa |1.0 | + +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+ + |372e2c66-ee59-4488-a6a6-546c28b3a151 |244b380b-acf1-4545-8d35-d6d01bc32fd6 |5d11dda4-fb32-4df6-86eb |1.0 |CERTIFIED |54bc478b7a9847db82156edad5d1f79f |1.0 | + +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+ + |23018f7f-fbce-479e-a77b-6b98ebf03266 |6bc22345-395d-4358-8954-45963761f968 |8fd2e5c8-981d-4a14-ba77 |1.0 |CERTIFIED |0cefd6ef5ad84d2995d66d0a24d2e92e |1.0 | + +--------------------------------------+--------------------------------------+--------------------------+----------+------------------------+----------------------------------+--------------+ diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json index 33cc69c5..b8768412 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json @@ -7,7 +7,7 @@ "X-FromAppId" : "onap-cli", "Accept" : "application/json", "USER_ID" : "cs0008", - "X-TransactionId" : "req-16f85bde-c0ba-411e-b020-9230cc67c1c5", + "X-TransactionId" : "req-6d1108d4-8ec3-477e-8808-1fb0cf789f13", "Content-Type" : "application/json" }, "json" : null diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml index e2462f00..2ae060e4 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml @@ -7,10 +7,10 @@ samples: input: --vf-id 047b9ff8-2414-45b7-b753-26342369f160 moco: vf2vfmodule-model-list-schema-1.1-moco.json ouput:| - +--------------------------------------+--------------------------------------+--------------------------------------------+----------------+ - |module-uuid |module-invariant-uuid |module-name |module-version | - +--------------------------------------+--------------------------------------+--------------------------------------------+----------------+ - |2110b26d-4db0-4445-b059-f1abcd4f9995 |782fda23-6885-48ed-959c-d2704862882e |847cb26a59a6475a94dd..dnsscaling..module-1 |1 | - +--------------------------------------+--------------------------------------+--------------------------------------------+----------------+ - |753140fc-a0b5-478b-ad33-9f883204ab82 |bcbb0793-0cd7-4f8f-b068-aa22b40464c0 |847cb26a59a6475a94dd..base_vlb..module-0 |1 | - +--------------------------------------+--------------------------------------+--------------------------------------------+----------------+ + +----------------------------------+--------------+--------------------------------------+--------------------------------------+--------------------------------------------+----------------+ + |vsp-uuid |vsp-version |module-uuid |module-invariant-uuid |module-name |module-version | + +----------------------------------+--------------+--------------------------------------+--------------------------------------+--------------------------------------------+----------------+ + |a8cd007fa101470e98516cd4549c568f |1.0 |2110b26d-4db0-4445-b059-f1abcd4f9995 |782fda23-6885-48ed-959c-d2704862882e |847cb26a59a6475a94dd..dnsscaling..module-1 |1 | + +----------------------------------+--------------+--------------------------------------+--------------------------------------+--------------------------------------------+----------------+ + | | |753140fc-a0b5-478b-ad33-9f883204ab82 |bcbb0793-0cd7-4f8f-b068-aa22b40464c0 |847cb26a59a6475a94dd..base_vlb..module-0 |1 | + +----------------------------------+--------------+--------------------------------------+--------------------------------------+--------------------------------------------+----------------+ diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml index 61e57bb4..0ade85f1 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: vlm-aggreement-create input: --name kanag-cli-la --description kanag cli la --vlm-feature-group-id 3a2fb75b52a54e9c8093e7c154210f9e --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 1.1 moco: vlm-aggreement-create-schema-1.1-moco.json - ouput:| + ouput: | +----------+----------------------------------+ |property |value | +----------+----------------------------------+ diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml index c80ff044..4305b29e 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: vlm-create input: --vendor-name kanag-cli --description First License created from CLI moco: vlm-create-schema-1.1-moco.json - ouput:| + ouput: | +----------+----------------------------------+ |property |value | +----------+----------------------------------+ diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml index 3e498ca0..019db2f9 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: vlm-feature-group-create input: --name kanag-cli-fg --description Kanag cli feature group --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 0.1 --vlm-key-group-id c37a1f205f444161a573f55dfec5f170 --vlm-entitle-pool-id aa61080fd965455ba5edbf60f4e375ef --part-number 123455 --manufacture-reference-number mkr123456 moco: vlm-feature-group-create-schema-1.1-moco.json - ouput:| + ouput: | +----------+----------------------------------+ |property |value | +----------+----------------------------------+ diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml index 11f3509d..de9b72d5 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: vlm-key-group-create input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --name kanag-cli-kg --description Kanag CLI key group -d --vlm-version 0.1 moco: vlm-key-group-create-schema-1.1-moco.json - ouput:| + ouput: | |property |value | +----------+----------------------------------+ |ID |c37a1f205f444161a573f55dfec5f170 | diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml index 523431d8..65fae325 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: vlm-list input: --long moco: vlm-list-schema-1.1-moco.json - ouput:| + ouput: | +----------------------------------+--------------------------+--------------+--------+--------------------------------+ |id |vendor-name |vlm-version |status |description | +----------------------------------+--------------------------+--------------+--------+--------------------------------+ diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml index d943d82d..90ad152b 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml @@ -6,7 +6,8 @@ samples: name: vsp-list input: -d moco: vsp-list-schema-1.1-moco.json - ouput:| + ouput: | + +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+ |ID |name |vendor-name |version |status |license-id | +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+ |8f08a17b9a4c4538b51a3064468baec0 |test-vsp |test-vendor |0.3 |Locked |0a12d68750704a54a7e9974595d7e951 | diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml index e40e9314..27285ddb 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: vsp-show input: --vsp-id b1caa2ec31ba4b738cbe5aab362b35aa --vsp-version 1.0 -d moco: vsp-show-schema-1.1-moco.json - ouput:| + ouput: | |property |value | +--------------+----------------------------------+ |name |Kanag-VSP | diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml index 119f5a80..decafb98 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml @@ -6,7 +6,7 @@ samples: name: vsp-validate input: --vsp-id 5ca119e2326045d1857ae3f04a816434 --vsp-version 0.1 moco: vsp-validate-schema-1.1-moco.json - ouput:| + ouput: | +----------+----------------------------------------------------+ |property |value | +----------+----------------------------------------------------+ |