aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/sdc/src/test/resources/onap-cli-sample/vsp
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-11-02 14:09:51 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-11-02 14:09:51 +0530
commit3c33460dde57fc93df5608cb5e75935f14ad53e4 (patch)
tree85cfa4f1e2e3f6392efd8c38be885935fcc90d12 /plugins/sdc/src/test/resources/onap-cli-sample/vsp
parent3a202c3ce9dce734fe22eb60d7946e8c04023215 (diff)
Update vsp commands with latest test inputs
CLI-57 Change-Id: Ic1063489de71691715c3cac27c2a926dc5a3bc48 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'plugins/sdc/src/test/resources/onap-cli-sample/vsp')
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json21
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-schema-1.1-sample.yaml9
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json4
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml2
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-moco.json647
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml116
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-moco.json31
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml9
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-moco.json59
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml15
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-moco.json21
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml9
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-moco.json33
-rw-r--r--plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml39
14 files changed, 898 insertions, 117 deletions
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json
new file mode 100644
index 00000000..bf29aed4
--- /dev/null
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json
@@ -0,0 +1,21 @@
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/onboarding-api/v1.0/vendor-software-products/f19cad8343794e93acb9cda2e4126281/versions/0.1/actions",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-37a1e812-60cc-4243-acb6-6a420f672b33",
+ "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/vsp-checkin-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-schema-1.1-sample.yaml
new file mode 100644
index 00000000..e00410a1
--- /dev/null
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-schema-1.1-sample.yaml
@@ -0,0 +1,9 @@
+onap_cli_sample_version: 1.0
+name: vsp-checkin
+version: onap-1.1
+samples:
+ sample1:
+ name: vsp-checkin
+ input: --vsp-id f19cad8343794e93acb9cda2e4126281 --vsp-version 0.1
+ moco: vsp-checkin-schema-1.1-moco.json
+ ouput: \ No newline at end of file
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json
index 089a5342..fb90a444 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json
@@ -1,13 +1,13 @@
[ {
"request" : {
"method" : "put",
- "uri" : "/onboarding-api/v1.0/vendor-software-products/5ca119e2326045d1857ae3f04a816434/versions/0.1/actions",
+ "uri" : "/onboarding-api/v1.0/vendor-software-products/f19cad8343794e93acb9cda2e4126281/versions/0.1/actions",
"headers" : {
"Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
"X-FromAppId" : "onap-cli",
"Accept" : "application/json",
"USER_ID" : "cs0008",
- "X-TransactionId" : "req-2d65c9e6-6a19-4390-9009-780bd810ab16",
+ "X-TransactionId" : "req-171c004a-033f-4c3b-bcba-b191d1be634e",
"Content-Type" : "application/json"
},
"json" : {
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml
index 7c649fd4..e7c1b960 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml
@@ -4,6 +4,6 @@ version: onap-1.1
samples:
sample1:
name: vsp-checkout
- input: --vsp-id 5ca119e2326045d1857ae3f04a816434 --vsp-version 0.1
+ input: --vsp-id f19cad8343794e93acb9cda2e4126281 --vsp-version 0.1
moco: vsp-checkout-schema-1.1-moco.json
ouput: \ No newline at end of file
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-moco.json
index a4270573..b2f96dd9 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-moco.json
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-moco.json
@@ -7,7 +7,7 @@
"X-FromAppId" : "onap-cli",
"Accept" : "application/json",
"USER_ID" : "cs0008",
- "X-TransactionId" : "req-25476de9-c4e4-4607-bc5f-e5bb68637c47",
+ "X-TransactionId" : "req-03806842-69f4-44d9-9b63-72d85cb7adc9",
"Content-Type" : "application/json"
},
"json" : null
@@ -15,26 +15,555 @@
"response" : {
"status" : 200,
"json" : {
- "listCount" : 18,
+ "listCount" : 36,
"results" : [ {
- "name" : "test-vsp",
- "description" : "test-vsp",
+ "name" : "kanag-cli-VLB",
+ "description" : "VLB created from CLI",
"category" : "resourceNewCategory.generic",
"subCategory" : "resourceNewCategory.generic.abstract",
- "vendorName" : "test-vendor",
- "vendorId" : "fc0fdcc825a54ca3b08e40f473b72d05",
+ "vendorName" : "Kanag-cli",
+ "vendorId" : "cf2d907d998e44698ce3b4cded5f66a7",
"licensingVersion" : {
+ "id" : "2.0",
+ "label" : "2.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "77e151d0503b45ecb7e40f5f5f1a887e",
+ "featureGroups" : [ "3a2fb75b52a54e9c8093e7c154210f9e" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "zip",
+ "networkPackageName" : "base_vlb",
+ "id" : "f19cad8343794e93acb9cda2e4126281",
+ "version" : {
+ "id" : "2.0",
+ "label" : "2.0"
+ },
+ "viewableVersions" : [ {
"id" : "1.0",
"label" : "1.0"
+ }, {
+ "id" : "2.0",
+ "label" : "2.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ }, {
+ "id" : "2.0",
+ "label" : "2.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "kanagVLB",
+ "description" : "VLB created from CLI",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.abstract",
+ "vendorName" : "Kanag-cli",
+ "vendorId" : "cf2d907d998e44698ce3b4cded5f66a7",
+ "licensingVersion" : {
+ "id" : "2.0",
+ "label" : "2.0"
},
"licensingData" : {
- "licenseAgreement" : "0a12d68750704a54a7e9974595d7e951",
- "featureGroups" : [ "2c5762b9747f495db8a99cbd73449edd" ]
+ "licenseAgreement" : "77e151d0503b45ecb7e40f5f5f1a887e",
+ "featureGroups" : [ "3a2fb75b52a54e9c8093e7c154210f9e" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "none",
+ "id" : "ff5bba2672a44654b186d70cf6bc9d95",
+ "version" : {
+ "id" : "0.1",
+ "label" : "0.1"
+ },
+ "viewableVersions" : [ {
+ "id" : "0.1",
+ "label" : "0.1"
+ } ],
+ "status" : "Locked",
+ "lockingUser" : "cs0008",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "ciVFOnboarded-vCSCF_aligned-08dc1256",
+ "description" : "new VSP description",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.database",
+ "vendorName" : "ciLicensef008e06a",
+ "vendorId" : "b5ea95a60e3b483da03d0911968cd778",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "ac631524f0e74f89abb6496665a58ff9",
+ "featureGroups" : [ "92c6bbc0a3c9481c9de869fe857d5ae5" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "csar",
+ "networkPackageName" : "vCSCF_aligned",
+ "id" : "aa1f969cf1ae4897aed5fe08d4d19a5a",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "ciVFOnboarded-Huawei_vMME-2b29f653",
+ "description" : "new VSP description",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.database",
+ "vendorName" : "ciLicense5c11752c",
+ "vendorId" : "84352b5d014c4d5382ce856d7597aebf",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "88fbce08b7f04f04a0b16fb3d2a5f640",
+ "featureGroups" : [ "ab580f48fe354bff967fb3aa24bdb7ea" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "csar",
+ "networkPackageName" : "Huawei_vMME",
+ "id" : "f22e285e6b354033bd9a2c1cf9268a6e",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "ciVFOnboarded-Huawei_vPCRF_aligned_fixed-51f1da14",
+ "description" : "new VSP description",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.database",
+ "vendorName" : "ciLicenseaf880546",
+ "vendorId" : "8e13a8b2e1f34374ad578edc9c912f11",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "db3a3d3c0a36433c8772494f04c02d0b",
+ "featureGroups" : [ "1874e51f051b4fa181855215b093ed2e" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "csar",
+ "networkPackageName" : "Huawei_vPCRF_aligned_fixed",
+ "id" : "3430c70e504c45d59cd7ccb4a388f26d",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "ciVFOnboarded-vSBC_aligned-7260da5f",
+ "description" : "new VSP description",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.database",
+ "vendorName" : "ciLicensecce293bb",
+ "vendorId" : "9f7053ae1aa04b8c9fa3d991f944a49b",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "42ad516b726f4723a142dd5d3629dd0a",
+ "featureGroups" : [ "e3fd0c11679d40cba5a050674df25f84" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "csar",
+ "networkPackageName" : "vSBC_aligned",
+ "id" : "c1ec9ea4fbd240cd9e69070a7ac17ee8",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "ciVFOnboarded-Huawei_vHSS-79402346",
+ "description" : "new VSP description",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.database",
+ "vendorName" : "ciLicense7d28e221",
+ "vendorId" : "3f47950121bf4e31a058b4870020bc2f",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "0438f48ec8d04ea5b3908910752e820f",
+ "featureGroups" : [ "bd5160fc13cd498fa89e758881f6d319" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "csar",
+ "networkPackageName" : "Huawei_vHSS",
+ "id" : "4668d80cbca64beb98423c924b35d3ac",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "ciVFOnboarded-vLB-6265cbc3",
+ "description" : "new VSP description",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.database",
+ "vendorName" : "ciLicense02ddba7e",
+ "vendorId" : "6fc132eca87d4e49b56357b9d83843a5",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "824296ae0b484b049f4e3061a404018f",
+ "featureGroups" : [ "dabc97fb14994a65aa822a9f31795f18" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "zip",
+ "networkPackageName" : "vLB",
+ "id" : "10e8667c8b3d4e86a406e806430b989e",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "ciVFOnboarded-base_vfw-199667fb",
+ "description" : "new VSP description",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.database",
+ "vendorName" : "ciLicense9acc959f",
+ "vendorId" : "0094601590ec4e709e560e928c44232a",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "fb69b7d933f94771b1961b03877abe86",
+ "featureGroups" : [ "63d1b82d8d3240d5a5cb44a18043d92a" ]
},
"onboardingMethod" : "NetworkPackage",
"onboardingOrigin" : "zip",
"networkPackageName" : "base_vfw",
- "id" : "8f08a17b9a4c4538b51a3064468baec0",
+ "id" : "9de86126015f4349a41e5a5f5e3eacf4",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "ciVFOnboarded-vgmux-a195f793",
+ "description" : "new VSP description",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.database",
+ "vendorName" : "ciLicensee5394ee2",
+ "vendorId" : "8f82813eb6304957911955e077d9be6f",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "087accbb0be14b0eb186bfe2feed8b80",
+ "featureGroups" : [ "7f401e3743a842dfa273d86b3b0d6e10" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "zip",
+ "networkPackageName" : "vgmux",
+ "id" : "9641f81b61504fa8af6885818b1ee34b",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "ciVFOnboarded-vgw-abaa9d6d",
+ "description" : "new VSP description",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.database",
+ "vendorName" : "ciLicense3eed3665",
+ "vendorId" : "b620898b5e5e4231a30a2ccecd39927e",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "d6f8c82f70c846aca75297fbdc257bb3",
+ "featureGroups" : [ "e8f992105a50486797bd8b1ab76be705" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "zip",
+ "networkPackageName" : "vgw",
+ "id" : "dea92da0ad90419c8f437222680a2333",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "ciVFOnboarded-infra-fceb5908",
+ "description" : "new VSP description",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.database",
+ "vendorName" : "ciLicense372060ea",
+ "vendorId" : "12cce4998b874d5e8096070f9c5d7395",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "1bb7f9e7fc7348edbba4aa3f8285a6d1",
+ "featureGroups" : [ "c85ef0a324e64fe69671d22fe92dfdbe" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "zip",
+ "networkPackageName" : "infra",
+ "id" : "9e4654364fe04d9ebe2a2485d67d6676",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "ciVFOnboarded-vbrgemu-bcfb002c",
+ "description" : "new VSP description",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.database",
+ "vendorName" : "ciLicense36e962a4",
+ "vendorId" : "78fd596a39534d51953e867adaef78f6",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "dc6b5d4d3f75422d954cbef0f6660f7a",
+ "featureGroups" : [ "dc027462eaca4316b0b9539b457156c6" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "zip",
+ "networkPackageName" : "vbrgemu",
+ "id" : "93b5df6c2f3d4a7dae362b111b0ed047",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "ciVFOnboarded-base_vvg-07839bb9",
+ "description" : "new VSP description",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.database",
+ "vendorName" : "ciLicensef9a1b52b",
+ "vendorId" : "651180d666c54887880b673884e03481",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "7162523b6bc84594a00a6b1a1814d8c3",
+ "featureGroups" : [ "9ce4b03941f744daa6d4c9ccf5193900" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "zip",
+ "networkPackageName" : "base_vvg",
+ "id" : "9c9a9000fc714e9d8a6baf495418ab96",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "ciVFOnboarded-vbng-008f4205",
+ "description" : "new VSP description",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.database",
+ "vendorName" : "ciLicense76f62092",
+ "vendorId" : "dd10e18e3af54234a20897ad65bfa311",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "78cb43095c834b628954fa26094c739f",
+ "featureGroups" : [ "24b1dab60e6d46249cdff1a40d5fd19c" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "zip",
+ "networkPackageName" : "vbng",
+ "id" : "63898b542cdd46b6b15ac771abda86cb",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "kanag-cli-vfw",
+ "description" : "VSP created from CLI for vFW",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.abstract",
+ "vendorName" : "Kanag",
+ "vendorId" : "b1caa2ec31ba4b738cbe5aab362b35aa",
+ "licensingVersion" : {
+ "id" : "4.0",
+ "label" : "4.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "b373c16f28854c6db9e027929ae5e5ed",
+ "featureGroups" : [ "efea8b9817b344c4b93c45dc141f6703" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "zip",
+ "networkPackageName" : "1",
+ "id" : "5ca119e2326045d1857ae3f04a816434",
+ "version" : {
+ "id" : "0.2",
+ "label" : "0.2"
+ },
+ "viewableVersions" : [ {
+ "id" : "0.1",
+ "label" : "0.1"
+ }, {
+ "id" : "0.2",
+ "label" : "0.2"
+ } ],
+ "status" : "Available",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "600a2ebf-1f94-4a4c-b18d",
+ "description" : "vendor software product",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.abstract",
+ "vendorName" : "4718de22-00d3-4607-b666",
+ "vendorId" : "9af398f516da4e63b4ec8d344866533b",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "43ba141c140f41a487e9fb99592cbc58",
+ "featureGroups" : [ "fa7e48a1705342c2b7cc454b15bbe45e" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "zip",
+ "networkPackageName" : "base_vfw",
+ "id" : "e65baf44883e4868ba96f9faed9ba97a",
"version" : {
"id" : "0.3",
"label" : "0.3"
@@ -49,12 +578,11 @@
"id" : "0.3",
"label" : "0.3"
} ],
- "status" : "Locked",
- "lockingUser" : "cs0008",
+ "status" : "Available",
"isOldVersion" : "False"
}, {
- "name" : "Kanag-VSP",
- "description" : "Test VSP created by Kanag",
+ "name" : "test-vsp-123",
+ "description" : "test",
"category" : "resourceNewCategory.generic",
"subCategory" : "resourceNewCategory.generic.abstract",
"vendorName" : "Kanag",
@@ -68,22 +596,22 @@
"featureGroups" : [ "efea8b9817b344c4b93c45dc141f6703" ]
},
"onboardingMethod" : "NetworkPackage",
- "onboardingOrigin" : "zip",
- "networkPackageName" : "base_vfw",
- "id" : "b1caa2ec31ba4b738cbe5aab362b35aa",
+ "onboardingOrigin" : "none",
+ "networkPackageName" : "Upload File",
+ "id" : "61bad2139ee742cf891ca6ecc5f39972",
"version" : {
- "id" : "1.0",
- "label" : "1.0"
+ "id" : "0.2",
+ "label" : "0.2"
},
"viewableVersions" : [ {
- "id" : "1.0",
- "label" : "1.0"
- } ],
- "finalVersions" : [ {
- "id" : "1.0",
- "label" : "1.0"
+ "id" : "0.1",
+ "label" : "0.1"
+ }, {
+ "id" : "0.2",
+ "label" : "0.2"
} ],
- "status" : "Final",
+ "status" : "Locked",
+ "lockingUser" : "cs0008",
"isOldVersion" : "False"
}, {
"name" : "05a0dd09-c3d0-4534-93ab",
@@ -122,6 +650,75 @@
"lockingUser" : "cs0008",
"isOldVersion" : "False"
}, {
+ "name" : "test-vsp",
+ "description" : "test-vsp",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.abstract",
+ "vendorName" : "test-vendor",
+ "vendorId" : "fc0fdcc825a54ca3b08e40f473b72d05",
+ "licensingVersion" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "0a12d68750704a54a7e9974595d7e951",
+ "featureGroups" : [ "2c5762b9747f495db8a99cbd73449edd" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "zip",
+ "networkPackageName" : "base_vfw",
+ "id" : "8f08a17b9a4c4538b51a3064468baec0",
+ "version" : {
+ "id" : "0.3",
+ "label" : "0.3"
+ },
+ "viewableVersions" : [ {
+ "id" : "0.1",
+ "label" : "0.1"
+ }, {
+ "id" : "0.2",
+ "label" : "0.2"
+ }, {
+ "id" : "0.3",
+ "label" : "0.3"
+ } ],
+ "status" : "Locked",
+ "lockingUser" : "cs0008",
+ "isOldVersion" : "False"
+ }, {
+ "name" : "Kanag-VSP",
+ "description" : "Test VSP created by Kanag",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.abstract",
+ "vendorName" : "Kanag",
+ "vendorId" : "1173c7be5fea4db799b1a5ef9512e57e",
+ "licensingVersion" : {
+ "id" : "4.0",
+ "label" : "4.0"
+ },
+ "licensingData" : {
+ "licenseAgreement" : "b373c16f28854c6db9e027929ae5e5ed",
+ "featureGroups" : [ "efea8b9817b344c4b93c45dc141f6703" ]
+ },
+ "onboardingMethod" : "NetworkPackage",
+ "onboardingOrigin" : "zip",
+ "networkPackageName" : "base_vfw",
+ "id" : "b1caa2ec31ba4b738cbe5aab362b35aa",
+ "version" : {
+ "id" : "1.0",
+ "label" : "1.0"
+ },
+ "viewableVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "finalVersions" : [ {
+ "id" : "1.0",
+ "label" : "1.0"
+ } ],
+ "status" : "Final",
+ "isOldVersion" : "False"
+ }, {
"name" : "ef35d3c9-a8c6-457c-a115",
"description" : "vendor software product",
"category" : "resourceNewCategory.generic",
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 90ad152b..393b4938 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
@@ -4,45 +4,81 @@ version: onap-1.1
samples:
sample1:
name: vsp-list
- input: -d
+ input:
moco: vsp-list-schema-1.1-moco.json
ouput: |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |ID |name |vendor-name |version |status |license-id |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |8f08a17b9a4c4538b51a3064468baec0 |test-vsp |test-vendor |0.3 |Locked |0a12d68750704a54a7e9974595d7e951 |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |b1caa2ec31ba4b738cbe5aab362b35aa |Kanag-VSP |Kanag |1.0 |Final |b373c16f28854c6db9e027929ae5e5ed |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |77527347f94947589431cb7c1938da2e |05a0dd09-c3d0-4534-93ab |a920b10d-c516-4380-835a |0.3 |Locked |fcbc7806bee446aaa93c5e97348e1bea |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |03774c7cfcac4054bdab346142214533 |ef35d3c9-a8c6-457c-a115 |0138a2e2-52bf-4f0b-81cd |1.0 |Final |babbefaae40744febdd0317670e23c44 |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |54bc478b7a9847db82156edad5d1f79f |5d11dda4-fb32-4df6-86eb |48fa02ef-e79b-4707-895e |1.0 |Final |db826ae7538744f2b4dcc8647433fde3 |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |5f5121f701df4fe588c966002a342fdf |136ab241-88ff-443a-88e8 |1e5d1422-1f5f-42fe-a98e |1.0 |Final |a8911a1e325b491b8e2d26746cc5a5ec |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |0cefd6ef5ad84d2995d66d0a24d2e92e |8fd2e5c8-981d-4a14-ba77 |3029be5e-9135-4083-bd2e |1.0 |Final |7fa43c11d6e94673ad6907ea3984588a |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |c212437049004e74b4ef0afb25ba41b8 |74361ede-ef8c-43f1-9d82 |c6ba2ef6-fe82-4f32-ad50 |1.0 |Final |962739901fcf41a2a321b50a86183be2 |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |a8cd007fa101470e98516cd4549c568f |847cb26a-59a6-475a-94dd |01eb54a1-f1ff-41a2-aafc |1.0 |Final |99e3783033de443db69d05996341e28d |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |59c07e069c7642e9afbc6117965a6c2f |ciVFOnboarded-vLB-3fbbe6d0 |ciLicense09c55d35 |1.0 |Final |ccd038278d0d413b8e693ea1547ea340 |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |65b7b4b564f34b5689b3786386600e5a |ciVFOnboarded-vCSCF_aligned-a5e83f2c |ciLicense7d8bbcab |1.0 |Final |52b777f2d6cf4079b4f09fba1470f368 |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |a75d123c802e465db80ae7c8e5a0b4d0 |ciVFOnboarded-base_vfw-548fb561 |ciLicense6bfd9421 |1.0 |Final |b491a8a92a06489ca6a8657d34cfe3fa |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |1f33fcc682cb484a952b96326f549aff |ciVFOnboarded-vgmux-5e7cab8c |ciLicense81acf730 |1.0 |Final |0a7237320b95403c91c5cd9c68a6f27e |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |bafdf7192a73436588044296aa225ed4 |ciVFOnboarded-vgw-8b2ea35e |ciLicensef3f5a4fa |1.0 |Final |15dbaf00e1e84a408dbd53bca5174a0d |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |c34167a92e5c4c3392badd5a2da2a267 |ciVFOnboarded-infra-0766a3d1 |ciLicense9fddd8db |1.0 |Final |8c4dfe75429c47d38ad2dba761e17bce |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |b160564a4b754a9e8a19d2fa924f3f96 |ciVFOnboarded-vbrgemu-806fb59e |ciLicense9a46fd22 |1.0 |Final |428ec00b136741d193d079701dfd0079 |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |c5ccbc48510240318b698a4f1e1cb620 |ciVFOnboarded-vbng-c9fa1c07 |ciLicensed955b6d7 |1.0 |Final |9fed1159021c42e282f53703f00c89e7 |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
- |34ac9b3e990f4ce093d2dd1b8e0f73d6 |ciVFOnboarded-base_vvg-e8b8c6ca |ciLicensef21d8db3 |1.0 |Final |9c43f7ab2862474c9fe00a157b48da3f |
- +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |ID |name |version |status |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |f19cad8343794e93acb9cda2e4126281 |kanag-cli-VLB |2.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |ff5bba2672a44654b186d70cf6bc9d95 |kanagVLB |0.1 |Locked |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |aa1f969cf1ae4897aed5fe08d4d19a5a |ciVFOnboarded-vCSCF_aligned-08dc1256 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |f22e285e6b354033bd9a2c1cf9268a6e |ciVFOnboarded-Huawei_vMME-2b29f653 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |3430c70e504c45d59cd7ccb4a388f26d |ciVFOnboarded-Huawei_vPCRF_aligned_fixed-51f1da14 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |c1ec9ea4fbd240cd9e69070a7ac17ee8 |ciVFOnboarded-vSBC_aligned-7260da5f |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |4668d80cbca64beb98423c924b35d3ac |ciVFOnboarded-Huawei_vHSS-79402346 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |10e8667c8b3d4e86a406e806430b989e |ciVFOnboarded-vLB-6265cbc3 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |9de86126015f4349a41e5a5f5e3eacf4 |ciVFOnboarded-base_vfw-199667fb |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |9641f81b61504fa8af6885818b1ee34b |ciVFOnboarded-vgmux-a195f793 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |dea92da0ad90419c8f437222680a2333 |ciVFOnboarded-vgw-abaa9d6d |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |9e4654364fe04d9ebe2a2485d67d6676 |ciVFOnboarded-infra-fceb5908 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |93b5df6c2f3d4a7dae362b111b0ed047 |ciVFOnboarded-vbrgemu-bcfb002c |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |9c9a9000fc714e9d8a6baf495418ab96 |ciVFOnboarded-base_vvg-07839bb9 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |63898b542cdd46b6b15ac771abda86cb |ciVFOnboarded-vbng-008f4205 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |5ca119e2326045d1857ae3f04a816434 |kanag-cli-vfw |0.2 |Available |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |e65baf44883e4868ba96f9faed9ba97a |600a2ebf-1f94-4a4c-b18d |0.3 |Available |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |61bad2139ee742cf891ca6ecc5f39972 |test-vsp-123 |0.2 |Locked |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |77527347f94947589431cb7c1938da2e |05a0dd09-c3d0-4534-93ab |0.3 |Locked |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |8f08a17b9a4c4538b51a3064468baec0 |test-vsp |0.3 |Locked |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |b1caa2ec31ba4b738cbe5aab362b35aa |Kanag-VSP |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |03774c7cfcac4054bdab346142214533 |ef35d3c9-a8c6-457c-a115 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |54bc478b7a9847db82156edad5d1f79f |5d11dda4-fb32-4df6-86eb |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |5f5121f701df4fe588c966002a342fdf |136ab241-88ff-443a-88e8 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |0cefd6ef5ad84d2995d66d0a24d2e92e |8fd2e5c8-981d-4a14-ba77 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |c212437049004e74b4ef0afb25ba41b8 |74361ede-ef8c-43f1-9d82 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |a8cd007fa101470e98516cd4549c568f |847cb26a-59a6-475a-94dd |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |59c07e069c7642e9afbc6117965a6c2f |ciVFOnboarded-vLB-3fbbe6d0 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |65b7b4b564f34b5689b3786386600e5a |ciVFOnboarded-vCSCF_aligned-a5e83f2c |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |a75d123c802e465db80ae7c8e5a0b4d0 |ciVFOnboarded-base_vfw-548fb561 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |1f33fcc682cb484a952b96326f549aff |ciVFOnboarded-vgmux-5e7cab8c |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |bafdf7192a73436588044296aa225ed4 |ciVFOnboarded-vgw-8b2ea35e |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |c34167a92e5c4c3392badd5a2da2a267 |ciVFOnboarded-infra-0766a3d1 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |b160564a4b754a9e8a19d2fa924f3f96 |ciVFOnboarded-vbrgemu-806fb59e |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |c5ccbc48510240318b698a4f1e1cb620 |ciVFOnboarded-vbng-c9fa1c07 |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
+ |34ac9b3e990f4ce093d2dd1b8e0f73d6 |ciVFOnboarded-base_vvg-e8b8c6ca |1.0 |Final |
+ +----------------------------------+----------------------------------------------------+----------+------------+
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-moco.json
new file mode 100644
index 00000000..9c93fb79
--- /dev/null
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-moco.json
@@ -0,0 +1,31 @@
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/onboarding-api/v1.0/vendor-software-products/f19cad8343794e93acb9cda2e4126281/versions/0.2/actions",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-b5c34991-c876-4b0f-b21b-9ba14d308ce4",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "action" : "Create_Package"
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "description" : "VLB created from CLI",
+ "vspName" : "kanag-cli-VLB",
+ "version" : "2.0",
+ "packageId" : "f19cad8343794e93acb9cda2e4126281",
+ "category" : "resourceNewCategory.generic",
+ "subCategory" : "resourceNewCategory.generic.abstract",
+ "vendorName" : "Kanag-cli",
+ "vendorRelease" : "1.0",
+ "packageType" : "CSAR"
+ }
+ }
+} ] \ No newline at end of file
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml
new file mode 100644
index 00000000..cf469559
--- /dev/null
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml
@@ -0,0 +1,9 @@
+onap_cli_sample_version: 1.0
+name: vsp-package
+version: onap-1.1
+samples:
+ sample1:
+ name: vsp-package
+ input: --vsp-id f19cad8343794e93acb9cda2e4126281 --vsp-version 0.2
+ moco: vsp-package-schema-1.1-moco.json
+ ouput: \ No newline at end of file
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-moco.json
index 1913e808..8caab9a1 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-moco.json
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-moco.json
@@ -1,13 +1,13 @@
[ {
"request" : {
"method" : "get",
- "uri" : "/onboarding-api/v1.0/vendor-software-products/b1caa2ec31ba4b738cbe5aab362b35aa/versions/1.0",
+ "uri" : "/onboarding-api/v1.0/vendor-software-products/a8cd007fa101470e98516cd4549c568f/versions/1.0",
"headers" : {
"Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
"X-FromAppId" : "onap-cli",
"Accept" : "application/json",
"USER_ID" : "cs0008",
- "X-TransactionId" : "req-0e7abd26-8f59-463a-be04-5855c548297e",
+ "X-TransactionId" : "req-4aa5939e-26d4-438a-81f4-4f7f3c68d138",
"Content-Type" : "application/json"
},
"json" : null
@@ -15,24 +15,24 @@
"response" : {
"status" : 200,
"json" : {
- "name" : "Kanag-VSP",
- "description" : "Test VSP created by Kanag",
+ "name" : "847cb26a-59a6-475a-94dd",
+ "description" : "vendor software product",
"category" : "resourceNewCategory.generic",
"subCategory" : "resourceNewCategory.generic.abstract",
- "vendorName" : "Kanag",
- "vendorId" : "1173c7be5fea4db799b1a5ef9512e57e",
+ "vendorName" : "01eb54a1-f1ff-41a2-aafc",
+ "vendorId" : "1a49df7b78654777a71f64f2c6c2468f",
"licensingVersion" : {
- "id" : "4.0",
- "label" : "4.0"
+ "id" : "1.0",
+ "label" : "1.0"
},
"licensingData" : {
- "licenseAgreement" : "b373c16f28854c6db9e027929ae5e5ed",
- "featureGroups" : [ "efea8b9817b344c4b93c45dc141f6703" ]
+ "licenseAgreement" : "99e3783033de443db69d05996341e28d",
+ "featureGroups" : [ "3050264504f04ce7afc54861c8ba69ed" ]
},
"onboardingMethod" : "NetworkPackage",
"onboardingOrigin" : "zip",
- "networkPackageName" : "base_vfw",
- "id" : "b1caa2ec31ba4b738cbe5aab362b35aa",
+ "networkPackageName" : "base_vlb",
+ "id" : "a8cd007fa101470e98516cd4549c568f",
"version" : {
"id" : "1.0",
"label" : "1.0"
@@ -49,31 +49,50 @@
"validationData" : {
"importStructure" : {
"heat" : [ {
- "fileName" : "base_vfw.yaml",
+ "fileName" : "dnsscaling.yaml",
"env" : {
- "fileName" : "base_vfw.env"
+ "fileName" : "dnsscaling.env"
},
"errors" : [ {
"level" : "WARNING",
- "message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vfw_private_2_port]. As a result, VF/VFC Profile may miss this information"
+ "message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [vlb_private_net_id], Resource ID [vdns_2_private_0_port]. As a result, VF/VFC Profile may miss this information"
+ }, {
+ "level" : "WARNING",
+ "message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vdns_2_private_1_port]. As a result, VF/VFC Profile may miss this information"
+ }, {
+ "level" : "WARNING",
+ "message" : "WARNING: Nova Server naming convention in image, flavor and name properties is not consistent, Resource ID [vdns_2]"
+ } ],
+ "base" : false
+ }, {
+ "fileName" : "base_vlb.yaml",
+ "env" : {
+ "fileName" : "base_vlb.env"
+ },
+ "errors" : [ {
+ "level" : "WARNING",
+ "message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vlb_private_1_port]. As a result, VF/VFC Profile may miss this information"
+ }, {
+ "level" : "WARNING",
+ "message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vdns_private_1_port]. As a result, VF/VFC Profile may miss this information"
}, {
"level" : "WARNING",
"message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vpg_private_1_port]. As a result, VF/VFC Profile may miss this information"
}, {
"level" : "WARNING",
- "message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vsn_private_1_port]. As a result, VF/VFC Profile may miss this information"
+ "message" : "WARNING: A resource is connected twice to the same network role, Network Role [vdns_0], Resource ID [onap_private]"
}, {
"level" : "WARNING",
- "message" : "WARNING: A resource is connected twice to the same network role, Network Role [vpg_0], Resource ID [onap_private]"
+ "message" : "WARNING: Nova Server naming convention in image, flavor and name properties is not consistent, Resource ID [vdns_0]"
}, {
"level" : "WARNING",
- "message" : "WARNING: Nova Server naming convention in image, flavor and name properties is not consistent, Resource ID [vpg_0]"
+ "message" : "WARNING: Missing Nova Server Metadata property, Resource ID [vpg_0]"
}, {
"level" : "WARNING",
- "message" : "WARNING: A resource is connected twice to the same network role, Network Role [vsn_0], Resource ID [onap_private]"
+ "message" : "WARNING: A resource is connected twice to the same network role, Network Role [vpg_0], Resource ID [onap_private]"
}, {
"level" : "WARNING",
- "message" : "WARNING: Nova Server naming convention in image, flavor and name properties is not consistent, Resource ID [vsn_0]"
+ "message" : "WARNING: Nova Server naming convention in image, flavor and name properties is not consistent, Resource ID [vpg_0]"
} ],
"base" : true
} ]
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 27285ddb..2173c0fb 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
@@ -4,18 +4,25 @@ version: onap-1.1
samples:
sample1:
name: vsp-show
- input: --vsp-id b1caa2ec31ba4b738cbe5aab362b35aa --vsp-version 1.0 -d
+ input: --vsp-id a8cd007fa101470e98516cd4549c568f --vsp-version 1.0 --long
moco: vsp-show-schema-1.1-moco.json
ouput: |
+ +--------------+----------------------------------+
|property |value |
+--------------+----------------------------------+
- |name |Kanag-VSP |
+ |name |847cb26a-59a6-475a-94dd |
+ +--------------+----------------------------------+
+ |ID |a8cd007fa101470e98516cd4549c568f |
+--------------+----------------------------------+
- |ID |b1caa2ec31ba4b738cbe5aab362b35aa |
+ |description |vendor software product |
+--------------+----------------------------------+
- |description |Test VSP created by Kanag |
+ |vendor-name |01eb54a1-f1ff-41a2-aafc |
+ +--------------+----------------------------------+
+ |vendor-id |1a49df7b78654777a71f64f2c6c2468f |
+--------------+----------------------------------+
|version |1.0 |
+--------------+----------------------------------+
|status |Final |
+--------------+----------------------------------+
+ |license-id |99e3783033de443db69d05996341e28d |
+ +--------------+----------------------------------+
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-moco.json
new file mode 100644
index 00000000..6ec6072b
--- /dev/null
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-moco.json
@@ -0,0 +1,21 @@
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/onboarding-api/v1.0/vendor-software-products/f19cad8343794e93acb9cda2e4126281/versions/0.1/actions",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-62799ac5-8412-4623-a202-0bfbc2c32c37",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "action" : "Submit"
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : { }
+ }
+} ] \ No newline at end of file
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml
index 866e3a4c..415be139 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml
@@ -1,8 +1,9 @@
onap_cli_sample_version: 1.0
-
name: vsp-submit
version: onap-1.1
samples:
- sample1:
- name: vsp-submit
- input: --vsp-id E563CB23A6BE49AF9A84CF579DAFB929 --vsp-version 0.1
+ sample1:
+ name: vsp-submit
+ input: --vsp-id f19cad8343794e93acb9cda2e4126281 --vsp-version 0.1
+ moco: vsp-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/vsp-validate-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-moco.json
index 6dc8041d..8ae9d2c5 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-moco.json
+++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-moco.json
@@ -1,13 +1,13 @@
[ {
"request" : {
"method" : "put",
- "uri" : "/onboarding-api/v1.0/vendor-software-products/5ca119e2326045d1857ae3f04a816434/versions/0.1/orchestration-template-candidate/process",
+ "uri" : "/onboarding-api/v1.0/vendor-software-products/f19cad8343794e93acb9cda2e4126281/versions/0.1/orchestration-template-candidate/process",
"headers" : {
"Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
"X-FromAppId" : "onap-cli",
"Accept" : "application/json",
"USER_ID" : "cs0008",
- "X-TransactionId" : "req-79f5d3d8-36b6-4b66-ad35-4666556ef022",
+ "X-TransactionId" : "req-acbc1cac-ef75-4062-b3c9-3d7b52877687",
"Content-Type" : "application/json"
},
"json" : { }
@@ -15,29 +15,42 @@
"response" : {
"status" : 200,
"json" : {
- "fileNames" : [ "base_vfw.yaml", "base_vfw.env" ],
+ "fileNames" : [ "base_vlb.env", "dnsscaling.yaml", "base_vlb.yaml", "dnsscaling.env" ],
"errors" : {
- "base_vfw.yaml" : [ {
+ "dnsscaling.yaml" : [ {
"level" : "WARNING",
- "message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vfw_private_2_port]. As a result, VF/VFC Profile may miss this information"
+ "message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [vlb_private_net_id], Resource ID [vdns_2_private_0_port]. As a result, VF/VFC Profile may miss this information"
+ }, {
+ "level" : "WARNING",
+ "message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vdns_2_private_1_port]. As a result, VF/VFC Profile may miss this information"
+ }, {
+ "level" : "WARNING",
+ "message" : "WARNING: Nova Server naming convention in image, flavor and name properties is not consistent, Resource ID [vdns_2]"
+ } ],
+ "base_vlb.yaml" : [ {
+ "level" : "WARNING",
+ "message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vlb_private_1_port]. As a result, VF/VFC Profile may miss this information"
+ }, {
+ "level" : "WARNING",
+ "message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vdns_private_1_port]. As a result, VF/VFC Profile may miss this information"
}, {
"level" : "WARNING",
"message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vpg_private_1_port]. As a result, VF/VFC Profile may miss this information"
}, {
"level" : "WARNING",
- "message" : "WARNING: Port 'Fixed_IPS' Parameter Name not aligned with Guidelines, Parameter Name [onap_private_subnet_id], Resource ID [vsn_private_1_port]. As a result, VF/VFC Profile may miss this information"
+ "message" : "WARNING: A resource is connected twice to the same network role, Network Role [vdns_0], Resource ID [onap_private]"
}, {
"level" : "WARNING",
- "message" : "WARNING: A resource is connected twice to the same network role, Network Role [vpg_0], Resource ID [onap_private]"
+ "message" : "WARNING: Nova Server naming convention in image, flavor and name properties is not consistent, Resource ID [vdns_0]"
}, {
"level" : "WARNING",
- "message" : "WARNING: Nova Server naming convention in image, flavor and name properties is not consistent, Resource ID [vpg_0]"
+ "message" : "WARNING: Missing Nova Server Metadata property, Resource ID [vpg_0]"
}, {
"level" : "WARNING",
- "message" : "WARNING: A resource is connected twice to the same network role, Network Role [vsn_0], Resource ID [onap_private]"
+ "message" : "WARNING: A resource is connected twice to the same network role, Network Role [vpg_0], Resource ID [onap_private]"
}, {
"level" : "WARNING",
- "message" : "WARNING: Nova Server naming convention in image, flavor and name properties is not consistent, Resource ID [vsn_0]"
+ "message" : "WARNING: Nova Server naming convention in image, flavor and name properties is not consistent, Resource ID [vpg_0]"
} ]
},
"status" : "Success"
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 decafb98..10bd700d 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
@@ -4,7 +4,7 @@ version: onap-1.1
samples:
sample1:
name: vsp-validate
- input: --vsp-id 5ca119e2326045d1857ae3f04a816434 --vsp-version 0.1
+ input: --vsp-id f19cad8343794e93acb9cda2e4126281 --vsp-version 0.1
moco: vsp-validate-schema-1.1-moco.json
ouput: |
+----------+----------------------------------------------------+
@@ -12,33 +12,50 @@ samples:
+----------+----------------------------------------------------+
|status |Success |
+----------+----------------------------------------------------+
- |errors |{base_vfw.yaml=[{"level":"WARNING","message":"WARN |
- | |ING: Port 'Fixed_IPS' Parameter Name not aligned |
- | |with Guidelines, Parameter Name |
+ |errors |{dnsscaling.yaml=[{"level":"WARNING","message":"WA |
+ | |RNING: Port 'Fixed_IPS' Parameter Name not |
+ | |aligned with Guidelines, Parameter Name |
+ | |[vlb_private_net_id], Resource ID |
+ | |[vdns_2_private_0_port]. As a result, VF\/VFC |
+ | |Profile may miss this information"},{"level":"WARN |
+ | |ING","message":"WARNING: Port 'Fixed_IPS' |
+ | |Parameter Name not aligned with Guidelines, |
+ | |Parameter Name [onap_private_subnet_id], Resource |
+ | |ID [vdns_2_private_1_port]. As a result, VF\/VFC |
+ | |Profile may miss this information"},{"level":"WARN |
+ | |ING","message":"WARNING: Nova Server naming |
+ | |convention in image, flavor and name properties |
+ | |is not consistent, Resource ID [vdns_2]"}], base_v |
+ | |lb.yaml=[{"level":"WARNING","message":"WARNING: |
+ | |Port 'Fixed_IPS' Parameter Name not aligned with |
+ | |Guidelines, Parameter Name |
| |[onap_private_subnet_id], Resource ID |
- | |[vfw_private_2_port]. As a result, VF\/VFC |
+ | |[vlb_private_1_port]. As a result, VF\/VFC |
| |Profile may miss this information"},{"level":"WARN |
| |ING","message":"WARNING: Port 'Fixed_IPS' |
| |Parameter Name not aligned with Guidelines, |
| |Parameter Name [onap_private_subnet_id], Resource |
- | |ID [vpg_private_1_port]. As a result, VF\/VFC |
+ | |ID [vdns_private_1_port]. As a result, VF\/VFC |
| |Profile may miss this information"},{"level":"WARN |
| |ING","message":"WARNING: Port 'Fixed_IPS' |
| |Parameter Name not aligned with Guidelines, |
| |Parameter Name [onap_private_subnet_id], Resource |
- | |ID [vsn_private_1_port]. As a result, VF\/VFC |
+ | |ID [vpg_private_1_port]. As a result, VF\/VFC |
| |Profile may miss this information"},{"level":"WARN |
| |ING","message":"WARNING: A resource is connected |
| |twice to the same network role, Network Role |
- | |[vpg_0], Resource ID [onap_private]"},{"level":"WA |
- | |RNING","message":"WARNING: Nova Server naming |
+ | |[vdns_0], Resource ID [onap_private]"},{"level":"W |
+ | |ARNING","message":"WARNING: Nova Server naming |
| |convention in image, flavor and name properties |
| |is not consistent, Resource ID |
+ | |[vdns_0]"},{"level":"WARNING","message":"WARNING: |
+ | |Missing Nova Server Metadata property, Resource |
+ | |ID |
| |[vpg_0]"},{"level":"WARNING","message":"WARNING: |
| |A resource is connected twice to the same network |
- | |role, Network Role [vsn_0], Resource ID [onap_priv |
+ | |role, Network Role [vpg_0], Resource ID [onap_priv |
| |ate]"},{"level":"WARNING","message":"WARNING: |
| |Nova Server naming convention in image, flavor |
| |and name properties is not consistent, Resource |
- | |ID [vsn_0]"}]} |
+ | |ID [vpg_0]"}]} |
+----------+----------------------------------------------------+