From d619f9e7837f8ee0cfc53854b74b1ff45a99619b Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Tue, 31 Oct 2017 15:55:40 +0530 Subject: Remove invalid samples and moco CLI-57 Change-Id: I29b172533103132dd61f8933a3ed4af7036d5f01 Signed-off-by: Kanagaraj Manickam k00365106 --- ...icense-entitlement-pool-create-schema-moco.json | 16 - .../license-entitlement-pool-show-schema-moco.json | 36 - .../license-key-group-create-1.1-moco.json | 16 - .../license-key-group-create-moco.json | 16 - .../license-key-group-show-schema-moco.json | 24 - .../license-model-create-schema-1.1-moco.json | 15 - .../license-model-create-schema-moco.json | 15 - .../license-model-show-schema-1.1-moco.json | 39 - .../license-model-show-schema-moco.json | 24 - .../vlm/vlm-checkin-schema-1.1-moco.json | 4 +- .../vlm/vlm-checkin-schema-1.1-sample.yaml | 2 +- .../vlm/vlm-list-schema-1.1-moco.json | 832 +++++++++++---------- .../vlm/vlm-list-schema-1.1-sample.yaml | 92 +-- .../vlm/vlm-submit-schema-1.1-moco.json | 4 +- .../vlm/vlm-submit-schema-1.1-sample.yaml | 2 +- .../vsp-checkin-schema-1.1-moco.json | 21 - .../vsp-checkin-schema-1.1-sample.yaml | 9 - 17 files changed, 470 insertions(+), 697 deletions(-) delete mode 100644 plugins/sdc/src/test/resources/onap-cli-sample/license-entitlement-pool-create-schema-moco.json delete mode 100644 plugins/sdc/src/test/resources/onap-cli-sample/license-entitlement-pool-show-schema-moco.json delete mode 100644 plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-create-1.1-moco.json delete mode 100644 plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-create-moco.json delete mode 100644 plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-show-schema-moco.json delete mode 100644 plugins/sdc/src/test/resources/onap-cli-sample/license-model-create-schema-1.1-moco.json delete mode 100644 plugins/sdc/src/test/resources/onap-cli-sample/license-model-create-schema-moco.json delete mode 100644 plugins/sdc/src/test/resources/onap-cli-sample/license-model-show-schema-1.1-moco.json delete mode 100644 plugins/sdc/src/test/resources/onap-cli-sample/license-model-show-schema-moco.json delete mode 100644 plugins/sdc/src/test/resources/onap-cli-sample/vsp-checkin-schema-1.1-moco.json delete mode 100644 plugins/sdc/src/test/resources/onap-cli-sample/vsp-checkin-schema-1.1-sample.yaml (limited to 'plugins/sdc/src/test/resources') diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-entitlement-pool-create-schema-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/license-entitlement-pool-create-schema-moco.json deleted file mode 100644 index 9baef0ef..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-entitlement-pool-create-schema-moco.json +++ /dev/null @@ -1,16 +0,0 @@ -[{ - "request" : - { - "method" : "post", - "uri" : "onboarding-api/v1.0/vendor-license-models/4904E77EC4EF4CB18083E8ED7D283585/entitlement-pools", - "headers" : { - "USER_ID": "cs0008", - "content-type" : "application/json" - }, - "json" : {"name": "demo-ep", "description": "demo ep desc", "thresholdValue": "99", "thresholdUnits": "Absolute", "entitlementMetric": {"choice": "CPU","other": ""}, "increments": "robot", "aggregationFunction": { "choice": "Peak", "other": ""}, "operationalScope": { "choices":["Availability_Zone"],"other":""},"time": {"choice": "Hour","other":""},"manufacturerReferenceNumber": "robot12345"} - }, - "response" : - { - "json" : {"value":"840FFB495CAA46A6B720E3D734D52C66"} - } -}] diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-entitlement-pool-show-schema-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/license-entitlement-pool-show-schema-moco.json deleted file mode 100644 index 02b06875..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-entitlement-pool-show-schema-moco.json +++ /dev/null @@ -1,36 +0,0 @@ -[{ - "requesN" : - { - "method" : "get", - "uri" : "onboarding-api/v1.0/vendor-license-models/4904E77EC4EF4CB18083E8ED7D283585/entitlement-pools/840FFB495CAA46A6B720E3D734D52C66", - "headers" : { - "USER_ID": "cs0008", - "content-type" : "application/json" - } - }, - "response" :{ - "json" : { - "name": "demo-ep", - "description": "demo ep desc", - "thresholdValue": 99, - "thresholdUnits": "Absolute", - "entitlementMetric": { - "choice": "CPU" - }, - "increments": "robot", - "aggregationFunction": { - "choice": "Peak" - }, - "operationalScope": { - "choices": [ - "Availability_Zone" - ] - }, - "time": { - "choice": "Hour" - }, - "manufacturerReferenceNumber": "robot12345", - "id": "840FFB495CAA46A6B720E3D734D52C66", - "referencingFeatureGroups": [] - }} -}] diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-create-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-create-1.1-moco.json deleted file mode 100644 index ee1c073d..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-create-1.1-moco.json +++ /dev/null @@ -1,16 +0,0 @@ -[{ - "request" : - { - "method" : "post", - "uri" : "onboarding-api/v1.0/vendor-license-models", - "headers" : { - "USER_ID": "cs0008", - "content-type" : "application/json" - }, - "json" : {"description": "test","name": "htipl-key-grp","operationalScope": {"choices": ["Tenant"],"other": ""},"type": "Universal"} - }, - "response" : - { - "json" : {"value":"81997d7d4795485daea7418fae26c5d0"} - } -}] \ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-create-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-create-moco.json deleted file mode 100644 index ee1c073d..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-create-moco.json +++ /dev/null @@ -1,16 +0,0 @@ -[{ - "request" : - { - "method" : "post", - "uri" : "onboarding-api/v1.0/vendor-license-models", - "headers" : { - "USER_ID": "cs0008", - "content-type" : "application/json" - }, - "json" : {"description": "test","name": "htipl-key-grp","operationalScope": {"choices": ["Tenant"],"other": ""},"type": "Universal"} - }, - "response" : - { - "json" : {"value":"81997d7d4795485daea7418fae26c5d0"} - } -}] \ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-show-schema-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-show-schema-moco.json deleted file mode 100644 index 7b7a56be..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-show-schema-moco.json +++ /dev/null @@ -1,24 +0,0 @@ -[{ - "requesN" : - { - "method" : "get", - "uri" : "onboarding-api/v1.0/vendor-license-models/4904E77EC4EF4CB18083E8ED7D283585/license-key-groups/3F57DDC6AF55420680D499CDAC047253", - "headers" : { - "USER_ID": "cs0008", - "content-type" : "application/json" - } - }, - "response" :{ - "json" : { - "name": "demo-key-group", - "description": "", - "type": "Universal", - "operationalScope": { - "choices": [ - "Tenant" - ] - }, - "id": "3F57DDC6AF55420680D499CDAC047253", - "referencingFeatureGroups": [] - }} -}] diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-model-create-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/license-model-create-schema-1.1-moco.json deleted file mode 100644 index 2970e34e..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-model-create-schema-1.1-moco.json +++ /dev/null @@ -1,15 +0,0 @@ -[{ - "request" : - { - "method" : "post", - "uri" : "/onboarding-api/v1.0/vendor-license-models", - "headers" : { - "USER_ID": "cs0008", - "content-type" : "application/json" - }, - "json" : {"vendorName": "htipl-sample", "description": "sample model", "iconRef": "icon"} - }, - "response" : { - "json" : {"value":"2366699475c943bdb283fc0b9106579c"} - } -}] \ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-model-create-schema-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/license-model-create-schema-moco.json deleted file mode 100644 index 7030ad42..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-model-create-schema-moco.json +++ /dev/null @@ -1,15 +0,0 @@ -[{ - "request" : - { - "method" : "post", - "uri" : "/onboarding-api/v1.0/vendor-license-models", - "headers" : { - "USER_ID": "cs0008", - "content-type" : "application/json" - }, - "json" : {"vendorName": "htipl-sample", "description": "sample model", "iconRef": "icon"} - }, - "response" : { - "json" : {"value":"2366699475c943bdb283fc0b9106579c"} - } -}] diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-model-show-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/license-model-show-schema-1.1-moco.json deleted file mode 100644 index f0439887..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-model-show-schema-1.1-moco.json +++ /dev/null @@ -1,39 +0,0 @@ -[{ - "request" : - { - "method" : "get", - "uri" : "onboarding-api/v1.0/vendor-license-models", - "headers" : { - "USER_ID": "cs0008", - "content-type" : "application/json" - } - }, - "response" :{ - "json" : { - "listCount": 1, - "results": [ - { - "vendorName": "856acdac-40ef-4482-9981", - "description": "vendor license model", - "iconRef": "icon", - "id": "214fa77b19bb4253a35df7882562f2d0", - "version": { - "id": "1.0", - "label": "1.0" - }, - "status": "Final", - "viewableVersions": [ - { - "id": "1.0", - "label": "1.0" - } - ], - "finalVersions": [ - { - "id": "1.0", - "label": "1.0" - } - ] - }] - }} -}] \ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-model-show-schema-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/license-model-show-schema-moco.json deleted file mode 100644 index 85f840e9..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-model-show-schema-moco.json +++ /dev/null @@ -1,24 +0,0 @@ -[{ - "requesN" : - { - "method" : "get", - "uri" : "onboarding-api/v1.0/vendor-license-models/4904E77EC4EF4CB18083E8ED7D283585", - "headers" : { - "USER_ID": "cs0008", - "content-type" : "application/json" - } - }, - "response" :{ - "json" : { - "vendorName": "5aa8a88c", - "description": "vendor license model", - "iconRef": "icon", - "id": "4904E77EC4EF4CB18083E8ED7D283585", - "version": "0.1", - "status": "Locked", - "lockingUser": "cs0008", - "viewableVersions": [ - "0.1" - ] - }} -}] diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json index 2493e9fd..c62f721c 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json @@ -1,13 +1,13 @@ [ { "request" : { "method" : "put", - "uri" : "/onboarding-api/v1.0/vendor-license-models/cf2d907d998e44698ce3b4cded5f66a7/versions/0.1/actions", + "uri" : "/onboarding-api/v1.0/vendor-license-models/cf2d907d998e44698ce3b4cded5f66a7/versions/1.1/actions", "headers" : { "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh", "X-FromAppId" : "onap-cli", "Accept" : "application/json", "USER_ID" : "cs0008", - "X-TransactionId" : "req-605ac4af-0fda-49c3-8ac4-850d008cd485", + "X-TransactionId" : "req-beafede7-5380-474d-b53f-793545527f89", "Content-Type" : "application/json" }, "json" : { diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml index 28ff5a47..93122103 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml @@ -4,6 +4,6 @@ version: onap-1.1 samples: sample1: name: vlm-checkin - input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 0.1 + input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 1.1 moco: vlm-checkin-schema-1.1-moco.json ouput: \ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-moco.json index 005833ac..9f99a895 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-moco.json +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-moco.json @@ -1,415 +1,419 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/onboarding-api/v1.0/vendor-license-models", - "headers" : { - "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "USER_ID" : "cs0008", - "X-TransactionId" : "req-8dd63676-53d7-4825-adea-be1a21add819", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "listCount" : 21, - "results" : [ { - "vendorName" : "kanag-cli", - "description" : "First License created from CLI", - "iconRef" : "icon", - "id" : "cf2d907d998e44698ce3b4cded5f66a7", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "Test", - "description" : "test", - "iconRef" : "icon", - "id" : "144497a1b7924e0fa73004573730e1b8", - "version" : { - "id" : "0.1", - "label" : "0.1" - }, - "status" : "Locked", - "lockingUser" : "cs0008", - "viewableVersions" : [ { - "id" : "0.1", - "label" : "0.1" - } ] - }, { - "vendorName" : "4718de22-00d3-4607-b666", - "description" : "vendor license model", - "iconRef" : "icon", - "id" : "9af398f516da4e63b4ec8d344866533b", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "Kanag", - "description" : "Kanagaraj M @ HTIPL", - "iconRef" : "icon", - "id" : "1173c7be5fea4db799b1a5ef9512e57e", - "version" : { - "id" : "4.0", - "label" : "4.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - }, { - "id" : "2.0", - "label" : "2.0" - }, { - "id" : "3.0", - "label" : "3.0" - }, { - "id" : "4.0", - "label" : "4.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - }, { - "id" : "2.0", - "label" : "2.0" - }, { - "id" : "3.0", - "label" : "3.0" - }, { - "id" : "4.0", - "label" : "4.0" - } ] - }, { - "vendorName" : "test-vendor", - "description" : "test ", - "iconRef" : "icon", - "id" : "fc0fdcc825a54ca3b08e40f473b72d05", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "0138a2e2-52bf-4f0b-81cd", - "description" : "vendor license model", - "iconRef" : "icon", - "id" : "b66c5e1b4af3432ca2f6cd05adf72340", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "48fa02ef-e79b-4707-895e", - "description" : "vendor license model", - "iconRef" : "icon", - "id" : "34c2c72e992742e3b7ceb78bfcd21ebb", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "1e5d1422-1f5f-42fe-a98e", - "description" : "vendor license model", - "iconRef" : "icon", - "id" : "4bbd11c581ce4bb187a0a37131e5bb60", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "3029be5e-9135-4083-bd2e", - "description" : "vendor license model", - "iconRef" : "icon", - "id" : "1329476d73014587839fd3ede08c3103", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "c6ba2ef6-fe82-4f32-ad50", - "description" : "vendor license model", - "iconRef" : "icon", - "id" : "2ca684a9805b40f9993239e77b82fb52", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "01eb54a1-f1ff-41a2-aafc", - "description" : "vendor license model", - "iconRef" : "icon", - "id" : "1a49df7b78654777a71f64f2c6c2468f", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "a920b10d-c516-4380-835a", - "description" : "vendor license model", - "iconRef" : "icon", - "id" : "5e571e8a25c8404da04f2a0ec179f576", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "ciLicense7d8bbcab", - "description" : "new vendor license model", - "iconRef" : "icon", - "id" : "4b1e1efd8bb944bdbc0c3e74a9402967", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "ciLicense09c55d35", - "description" : "new vendor license model", - "iconRef" : "icon", - "id" : "816c04fd4ee849f2b80435e0944189fa", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "ciLicense6bfd9421", - "description" : "new vendor license model", - "iconRef" : "icon", - "id" : "9408208f5b6d4eb997dff1b901f1fb95", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "ciLicense81acf730", - "description" : "new vendor license model", - "iconRef" : "icon", - "id" : "eda4e9d1cae14cad95befc1728629574", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "ciLicensef3f5a4fa", - "description" : "new vendor license model", - "iconRef" : "icon", - "id" : "022140c2dc4e40bbae096aa1fb5cfbe9", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "ciLicense9fddd8db", - "description" : "new vendor license model", - "iconRef" : "icon", - "id" : "19f92b345cae423ab4ea6c5527d55ef6", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "ciLicense9a46fd22", - "description" : "new vendor license model", - "iconRef" : "icon", - "id" : "492d9259fc3e493d8fa6afd488054508", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "ciLicensed955b6d7", - "description" : "new vendor license model", - "iconRef" : "icon", - "id" : "a5da3e50ed72483fbfb134bac84b31f6", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - }, { - "vendorName" : "ciLicensef21d8db3", - "description" : "new vendor license model", - "iconRef" : "icon", - "id" : "9ff65b0b943141a7b99481bbcaedc294", - "version" : { - "id" : "1.0", - "label" : "1.0" - }, - "status" : "Final", - "viewableVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ], - "finalVersions" : [ { - "id" : "1.0", - "label" : "1.0" - } ] - } ] - } - } +[ { + "request" : { + "method" : "get", + "uri" : "/onboarding-api/v1.0/vendor-license-models", + "headers" : { + "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh", + "X-FromAppId" : "onap-cli", + "Accept" : "application/json", + "USER_ID" : "cs0008", + "X-TransactionId" : "req-45e743b7-f417-4159-9a1b-95af8b24aad2", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 200, + "json" : { + "listCount" : 21, + "results" : [ { + "vendorName" : "kanag-cli", + "description" : "First License created from CLI", + "iconRef" : "icon", + "id" : "cf2d907d998e44698ce3b4cded5f66a7", + "version" : { + "id" : "1.1", + "label" : "1.1" + }, + "status" : "Locked", + "lockingUser" : "cs0008", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + }, { + "id" : "1.1", + "label" : "1.1" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "Test", + "description" : "test", + "iconRef" : "icon", + "id" : "144497a1b7924e0fa73004573730e1b8", + "version" : { + "id" : "0.1", + "label" : "0.1" + }, + "status" : "Locked", + "lockingUser" : "cs0008", + "viewableVersions" : [ { + "id" : "0.1", + "label" : "0.1" + } ] + }, { + "vendorName" : "4718de22-00d3-4607-b666", + "description" : "vendor license model", + "iconRef" : "icon", + "id" : "9af398f516da4e63b4ec8d344866533b", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "Kanag", + "description" : "Kanagaraj M @ HTIPL", + "iconRef" : "icon", + "id" : "1173c7be5fea4db799b1a5ef9512e57e", + "version" : { + "id" : "4.0", + "label" : "4.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + }, { + "id" : "2.0", + "label" : "2.0" + }, { + "id" : "3.0", + "label" : "3.0" + }, { + "id" : "4.0", + "label" : "4.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + }, { + "id" : "2.0", + "label" : "2.0" + }, { + "id" : "3.0", + "label" : "3.0" + }, { + "id" : "4.0", + "label" : "4.0" + } ] + }, { + "vendorName" : "test-vendor", + "description" : "test ", + "iconRef" : "icon", + "id" : "fc0fdcc825a54ca3b08e40f473b72d05", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "0138a2e2-52bf-4f0b-81cd", + "description" : "vendor license model", + "iconRef" : "icon", + "id" : "b66c5e1b4af3432ca2f6cd05adf72340", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "48fa02ef-e79b-4707-895e", + "description" : "vendor license model", + "iconRef" : "icon", + "id" : "34c2c72e992742e3b7ceb78bfcd21ebb", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "1e5d1422-1f5f-42fe-a98e", + "description" : "vendor license model", + "iconRef" : "icon", + "id" : "4bbd11c581ce4bb187a0a37131e5bb60", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "3029be5e-9135-4083-bd2e", + "description" : "vendor license model", + "iconRef" : "icon", + "id" : "1329476d73014587839fd3ede08c3103", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "c6ba2ef6-fe82-4f32-ad50", + "description" : "vendor license model", + "iconRef" : "icon", + "id" : "2ca684a9805b40f9993239e77b82fb52", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "01eb54a1-f1ff-41a2-aafc", + "description" : "vendor license model", + "iconRef" : "icon", + "id" : "1a49df7b78654777a71f64f2c6c2468f", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "a920b10d-c516-4380-835a", + "description" : "vendor license model", + "iconRef" : "icon", + "id" : "5e571e8a25c8404da04f2a0ec179f576", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "ciLicense7d8bbcab", + "description" : "new vendor license model", + "iconRef" : "icon", + "id" : "4b1e1efd8bb944bdbc0c3e74a9402967", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "ciLicense09c55d35", + "description" : "new vendor license model", + "iconRef" : "icon", + "id" : "816c04fd4ee849f2b80435e0944189fa", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "ciLicense6bfd9421", + "description" : "new vendor license model", + "iconRef" : "icon", + "id" : "9408208f5b6d4eb997dff1b901f1fb95", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "ciLicense81acf730", + "description" : "new vendor license model", + "iconRef" : "icon", + "id" : "eda4e9d1cae14cad95befc1728629574", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "ciLicensef3f5a4fa", + "description" : "new vendor license model", + "iconRef" : "icon", + "id" : "022140c2dc4e40bbae096aa1fb5cfbe9", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "ciLicense9fddd8db", + "description" : "new vendor license model", + "iconRef" : "icon", + "id" : "19f92b345cae423ab4ea6c5527d55ef6", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "ciLicense9a46fd22", + "description" : "new vendor license model", + "iconRef" : "icon", + "id" : "492d9259fc3e493d8fa6afd488054508", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "ciLicensed955b6d7", + "description" : "new vendor license model", + "iconRef" : "icon", + "id" : "a5da3e50ed72483fbfb134bac84b31f6", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + }, { + "vendorName" : "ciLicensef21d8db3", + "description" : "new vendor license model", + "iconRef" : "icon", + "id" : "9ff65b0b943141a7b99481bbcaedc294", + "version" : { + "id" : "1.0", + "label" : "1.0" + }, + "status" : "Final", + "viewableVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ], + "finalVersions" : [ { + "id" : "1.0", + "label" : "1.0" + } ] + } ] + } + } } ] \ No newline at end of file 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 6ead4cf2..523431d8 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 @@ -4,51 +4,51 @@ version: onap-1.1 samples: sample1: name: vlm-list - input: + input: --long moco: vlm-list-schema-1.1-moco.json ouput:| - +----------------------------------+--------------------------+--------+ - |id |vendor-name |status | - +----------------------------------+--------------------------+--------+ - |cf2d907d998e44698ce3b4cded5f66a7 |kanag-cli |Final | - +----------------------------------+--------------------------+--------+ - |144497a1b7924e0fa73004573730e1b8 |Test |Locked | - +----------------------------------+--------------------------+--------+ - |9af398f516da4e63b4ec8d344866533b |4718de22-00d3-4607-b666 |Final | - +----------------------------------+--------------------------+--------+ - |1173c7be5fea4db799b1a5ef9512e57e |Kanag |Final | - +----------------------------------+--------------------------+--------+ - |fc0fdcc825a54ca3b08e40f473b72d05 |test-vendor |Final | - +----------------------------------+--------------------------+--------+ - |b66c5e1b4af3432ca2f6cd05adf72340 |0138a2e2-52bf-4f0b-81cd |Final | - +----------------------------------+--------------------------+--------+ - |34c2c72e992742e3b7ceb78bfcd21ebb |48fa02ef-e79b-4707-895e |Final | - +----------------------------------+--------------------------+--------+ - |4bbd11c581ce4bb187a0a37131e5bb60 |1e5d1422-1f5f-42fe-a98e |Final | - +----------------------------------+--------------------------+--------+ - |1329476d73014587839fd3ede08c3103 |3029be5e-9135-4083-bd2e |Final | - +----------------------------------+--------------------------+--------+ - |2ca684a9805b40f9993239e77b82fb52 |c6ba2ef6-fe82-4f32-ad50 |Final | - +----------------------------------+--------------------------+--------+ - |1a49df7b78654777a71f64f2c6c2468f |01eb54a1-f1ff-41a2-aafc |Final | - +----------------------------------+--------------------------+--------+ - |5e571e8a25c8404da04f2a0ec179f576 |a920b10d-c516-4380-835a |Final | - +----------------------------------+--------------------------+--------+ - |4b1e1efd8bb944bdbc0c3e74a9402967 |ciLicense7d8bbcab |Final | - +----------------------------------+--------------------------+--------+ - |816c04fd4ee849f2b80435e0944189fa |ciLicense09c55d35 |Final | - +----------------------------------+--------------------------+--------+ - |9408208f5b6d4eb997dff1b901f1fb95 |ciLicense6bfd9421 |Final | - +----------------------------------+--------------------------+--------+ - |eda4e9d1cae14cad95befc1728629574 |ciLicense81acf730 |Final | - +----------------------------------+--------------------------+--------+ - |022140c2dc4e40bbae096aa1fb5cfbe9 |ciLicensef3f5a4fa |Final | - +----------------------------------+--------------------------+--------+ - |19f92b345cae423ab4ea6c5527d55ef6 |ciLicense9fddd8db |Final | - +----------------------------------+--------------------------+--------+ - |492d9259fc3e493d8fa6afd488054508 |ciLicense9a46fd22 |Final | - +----------------------------------+--------------------------+--------+ - |a5da3e50ed72483fbfb134bac84b31f6 |ciLicensed955b6d7 |Final | - +----------------------------------+--------------------------+--------+ - |9ff65b0b943141a7b99481bbcaedc294 |ciLicensef21d8db3 |Final | - +----------------------------------+--------------------------+--------+ + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |id |vendor-name |vlm-version |status |description | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |cf2d907d998e44698ce3b4cded5f66a7 |kanag-cli |1.1 |Locked |First License created from CLI | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |144497a1b7924e0fa73004573730e1b8 |Test |0.1 |Locked |test | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |9af398f516da4e63b4ec8d344866533b |4718de22-00d3-4607-b666 |1.0 |Final |vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |1173c7be5fea4db799b1a5ef9512e57e |Kanag |4.0 |Final |Kanagaraj M @ HTIPL | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |fc0fdcc825a54ca3b08e40f473b72d05 |test-vendor |1.0 |Final |test | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |b66c5e1b4af3432ca2f6cd05adf72340 |0138a2e2-52bf-4f0b-81cd |1.0 |Final |vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |34c2c72e992742e3b7ceb78bfcd21ebb |48fa02ef-e79b-4707-895e |1.0 |Final |vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |4bbd11c581ce4bb187a0a37131e5bb60 |1e5d1422-1f5f-42fe-a98e |1.0 |Final |vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |1329476d73014587839fd3ede08c3103 |3029be5e-9135-4083-bd2e |1.0 |Final |vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |2ca684a9805b40f9993239e77b82fb52 |c6ba2ef6-fe82-4f32-ad50 |1.0 |Final |vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |1a49df7b78654777a71f64f2c6c2468f |01eb54a1-f1ff-41a2-aafc |1.0 |Final |vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |5e571e8a25c8404da04f2a0ec179f576 |a920b10d-c516-4380-835a |1.0 |Final |vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |4b1e1efd8bb944bdbc0c3e74a9402967 |ciLicense7d8bbcab |1.0 |Final |new vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |816c04fd4ee849f2b80435e0944189fa |ciLicense09c55d35 |1.0 |Final |new vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |9408208f5b6d4eb997dff1b901f1fb95 |ciLicense6bfd9421 |1.0 |Final |new vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |eda4e9d1cae14cad95befc1728629574 |ciLicense81acf730 |1.0 |Final |new vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |022140c2dc4e40bbae096aa1fb5cfbe9 |ciLicensef3f5a4fa |1.0 |Final |new vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |19f92b345cae423ab4ea6c5527d55ef6 |ciLicense9fddd8db |1.0 |Final |new vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |492d9259fc3e493d8fa6afd488054508 |ciLicense9a46fd22 |1.0 |Final |new vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |a5da3e50ed72483fbfb134bac84b31f6 |ciLicensed955b6d7 |1.0 |Final |new vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ + |9ff65b0b943141a7b99481bbcaedc294 |ciLicensef21d8db3 |1.0 |Final |new vendor license model | + +----------------------------------+--------------------------+--------------+--------+--------------------------------+ diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-moco.json index ea12e59e..b7811539 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-moco.json +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-moco.json @@ -1,13 +1,13 @@ [ { "request" : { "method" : "put", - "uri" : "/onboarding-api/v1.0/vendor-license-models/cf2d907d998e44698ce3b4cded5f66a7/versions/0.1/actions", + "uri" : "/onboarding-api/v1.0/vendor-license-models/cf2d907d998e44698ce3b4cded5f66a7/versions/1.1/actions", "headers" : { "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh", "X-FromAppId" : "onap-cli", "Accept" : "application/json", "USER_ID" : "cs0008", - "X-TransactionId" : "req-0ea84b6b-9968-4ee0-9976-23624e958910", + "X-TransactionId" : "req-18ac1e35-bf92-4597-bf15-aea0e240767b", "Content-Type" : "application/json" }, "json" : { diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml index ea796eed..a262b142 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml @@ -4,6 +4,6 @@ version: onap-1.1 samples: sample1: name: vlm-submit - input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 0.1 + input: --vlm-id cf2d907d998e44698ce3b4cded5f66a7 --vlm-version 1.1 moco: vlm-submit-schema-1.1-moco.json ouput: \ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp-checkin-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vsp-checkin-schema-1.1-moco.json deleted file mode 100644 index ff239076..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp-checkin-schema-1.1-moco.json +++ /dev/null @@ -1,21 +0,0 @@ -[ { - "request" : { - "method" : "put", - "uri" : "/onboarding-api/v1.0/vendor-software-products/5ca119e2326045d1857ae3f04a816434/versions/0.1/actions", - "headers" : { - "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "USER_ID" : "cs0008", - "X-TransactionId" : "req-25c70cc1-fcfb-4058-baf3-c0f3d8a1a224", - "Content-Type" : "application/json" - }, - "json" : { - "action" : "Checkin" - } - }, - "response" : { - "status" : 200, - "json" : { } - } -} ] \ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp-checkin-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp-checkin-schema-1.1-sample.yaml deleted file mode 100644 index 81148ef8..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp-checkin-schema-1.1-sample.yaml +++ /dev/null @@ -1,9 +0,0 @@ -onap_cli_sample_version: 1.0 -name: vsp-checkin -version: onap-1.1 -samples: - sample1: - name: vsp-checkin - input: --vsp-id 5ca119e2326045d1857ae3f04a816434 --vsp-version 0.1 - moco: vsp-checkin-schema-1.1-moco.json - ouput: \ No newline at end of file -- cgit 1.2.3-korg