aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-11-14 11:50:31 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-11-21 18:07:52 +0530
commit9a7c3f58efc9a4fcff5052700457cf6f7565cf39 (patch)
treeca515d799e405788914f837a09a780fc5c95781e /plugins
parente61a25554503eca7ae758318651551e6e3b6eaca (diff)
Merges from 1.1.0
Issue-Id: CLI-66 Change-Id: I89fde334e2425eb91630912d726c320ece4aebd6 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/onap-1.0/auth/pom.xml2
-rw-r--r--plugins/onap-1.0/catalog/pom.xml2
-rw-r--r--plugins/onap-1.0/features/aai/pom.xml2
-rw-r--r--plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml2
-rw-r--r--plugins/onap-1.0/features/pom.xml2
-rw-r--r--plugins/onap-1.0/features/sdc/pom.xml2
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml2
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml2
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml2
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml2
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml2
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml2
-rw-r--r--plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml2
-rw-r--r--plugins/onap-1.0/pom.xml2
-rw-r--r--plugins/onap-1.1/auth/pom.xml2
-rw-r--r--plugins/onap-1.1/catalog/pom.xml2
-rw-r--r--plugins/onap-1.1/features/aai/pom.xml2
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/onap-cli-schema/service-instance/service-list-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-list-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml (renamed from plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-show-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.1.yaml18
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-sample-1.1.yaml9
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-sample-1.1.yaml18
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-sample-1.1.yaml23
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-moco.json)82
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json)34
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-sample-1.1.yaml13
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-moco.json)44
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml)4
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-sample-1.1.yaml14
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-moco.json)68
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-moco.json)68
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json)34
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-sample-1.1.yaml24
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-moco.json)106
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json)82
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json)34
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-sample-1.1.yaml16
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json)48
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml)4
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-sample-1.1.yaml23
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json)68
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-moco.json)40
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-sample-1.1.yaml9
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-moco.json)34
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-sample-1.1.yaml14
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-moco.json)86
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-moco.json)68
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-moco.json)34
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-sample-1.1.yaml25
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-moco.json (renamed from plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-moco.json)84
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml (renamed from plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml2
-rw-r--r--plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml2
-rw-r--r--plugins/onap-1.1/features/msb/pom.xml2
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-moco.json (renamed from plugins/msb/src/test/resources/onap-cli-sample/microservice-create-schema-moco.json)0
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-sample.yaml (renamed from plugins/msb/src/test/resources/onap-cli-sample/microservice-create-schema-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-moco.json (renamed from plugins/msb/src/test/resources/onap-cli-sample/microservice-delete-schema-moco.json)0
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-sample.yaml (renamed from plugins/msb/src/test/resources/onap-cli-sample/microservice-delete-schema-sample.yaml)3
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-moco.json (renamed from plugins/msb/src/test/resources/onap-cli-sample/microservice-list-schema-moco.json)2668
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-sample.yaml (renamed from plugins/msb/src/test/resources/onap-cli-sample/microservice-list-schema-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-moco.json (renamed from plugins/msb/src/test/resources/onap-cli-sample/microservice-show-schema-moco.json)80
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-sample.yaml (renamed from plugins/msb/src/test/resources/onap-cli-sample/microservice-show-schema-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-create-service-sample-1.1.yaml20
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-delete-service-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-list-service-sample-1.1.yaml14
-rw-r--r--plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-show-service-sample-1.1.yaml14
-rw-r--r--plugins/onap-1.1/features/pom.xml2
-rw-r--r--plugins/onap-1.1/features/sdc/pom.xml2
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-add-vf-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-approve-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-complete-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-complete-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-request-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-request-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-start-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-start-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-checkin-schema-1.1.yaml)16
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-checkout-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-create-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-distribute-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-list-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-revert-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-revert-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/service-model/service2vf-model-list-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-complete-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-certify-complete-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-request-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-certify-request-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-start-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-certify-start-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkin-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-checkin-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-create-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-list-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-list-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-create-schema.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-entitlement-pool-create-schema.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-show-schema.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-entitlement-pool-show-schema.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-create-schema.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-group-create-schema.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-show-schema.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-group-show-schema.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-create-schema.yaml (renamed from plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml)5
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-show-schema.yaml (renamed from plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml)7
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-aggreement-create-schema-1.1.yaml)16
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-list-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-aggreement-list-schema-1.1.yaml)16
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkin-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-checkin-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkout-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-checkout-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-create-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-create-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-create-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-entitlement-pool-create-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-list-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-entitlement-pool-list-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-create-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-feature-group-create-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-list-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-feature-group-list-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-create-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-key-group-create-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-list-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-key-group-list-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-list-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-list-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-revert-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-revert-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-submit-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-submit-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml)11
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema-1.1.yaml)16
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml29
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkout-schema-1.1.yaml)15
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml32
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema-1.1.yaml)16
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml81
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml)16
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml34
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-package-schema-1.1.yaml)16
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-revert-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-revert-schema-1.1.yaml)16
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema-1.1.yaml)16
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml47
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema-1.1.yaml)16
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml29
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml35
-rw-r--r--plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-1.1.yaml (renamed from plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-validate-schema-1.1.yaml)16
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-add-vf-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-add-vf-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-complete-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-complete-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-request-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-request-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-start-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-start-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-checkin-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-checkin-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-create-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-distribute-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-distribute-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service2vf-model-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-complete-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-complete-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-request-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-request-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-start-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-start-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-checkin-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-checkin-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-create-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-create-schema.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-entitlement-pool-create-schema.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-show-schema.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-entitlement-pool-show-schema.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-create-schema.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-group-create-schema.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-show-schema.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-group-show-schema.yaml)4
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-create-schema.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-model-create-schema.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-show-schema.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-model-show-schema.yaml)4
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-create-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkout-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkout-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-create-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-create-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-revert-schema-1.1-moco.json)40
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-revert-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml8
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml9
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml14
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml18
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-revert-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-revert-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml14
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml8
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml8
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-moco.json (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml (renamed from plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/so/pom.xml2
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml13
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml19
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-1.1.yaml (renamed from plugins/so/src/main/resources/onap-cli-schema/services/vf-create-schema-1.1.yaml)16
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-1.1.yaml (renamed from plugins/so/src/main/resources/onap-cli-schema/services/vf-delete-schema-1.1.yaml)17
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml4
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml18
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-1.1.yaml (renamed from plugins/so/src/main/resources/onap-cli-schema/services/vfmodule-create-schema-1.1.yaml)16
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml76
-rw-r--r--plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml46
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml2
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-moco.json (renamed from plugins/so/src/test/resources/onap-cli-sample/services/service-create-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-sample.yaml (renamed from plugins/so/src/test/resources/onap-cli-sample/services/service-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml2
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json (renamed from plugins/so/src/test/resources/onap-cli-sample/services/vf-create-schema-1.1-moco.json)0
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-sample.yaml (renamed from plugins/so/src/test/resources/onap-cli-sample/services/vf-create-schema-1.1-sample.yaml)2
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml2
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml2
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-1.1/pom.xml2
-rw-r--r--plugins/pom.xml6
-rw-r--r--plugins/sample/pom.xml2
-rw-r--r--plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-model-create-schema.yaml41
-rw-r--r--plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-model-show-schema.yaml50
289 files changed, 2602 insertions, 3332 deletions
diff --git a/plugins/onap-1.0/auth/pom.xml b/plugins/onap-1.0/auth/pom.xml
index 15da812b..f1d6ab15 100644
--- a/plugins/onap-1.0/auth/pom.xml
+++ b/plugins/onap-1.0/auth/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins-onap-1.0</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.0-auth</artifactId>
diff --git a/plugins/onap-1.0/catalog/pom.xml b/plugins/onap-1.0/catalog/pom.xml
index 7aac33ac..f1e13930 100644
--- a/plugins/onap-1.0/catalog/pom.xml
+++ b/plugins/onap-1.0/catalog/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins-onap-1.0</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.0-catalog</artifactId>
diff --git a/plugins/onap-1.0/features/aai/pom.xml b/plugins/onap-1.0/features/aai/pom.xml
index 236517ea..587d554b 100644
--- a/plugins/onap-1.0/features/aai/pom.xml
+++ b/plugins/onap-1.0/features/aai/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins-onap-1.0-features</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.0-features-aai</artifactId>
diff --git a/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml b/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
index 9b267481..b448c8cc 100644
--- a/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
+++ b/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: cloud-list
version: onap-1.0
diff --git a/plugins/onap-1.0/features/pom.xml b/plugins/onap-1.0/features/pom.xml
index 8c9592c2..0dfd033e 100644
--- a/plugins/onap-1.0/features/pom.xml
+++ b/plugins/onap-1.0/features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins-onap-1.0</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.0-features</artifactId>
diff --git a/plugins/onap-1.0/features/sdc/pom.xml b/plugins/onap-1.0/features/sdc/pom.xml
index de46a506..275cae52 100644
--- a/plugins/onap-1.0/features/sdc/pom.xml
+++ b/plugins/onap-1.0/features/sdc/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins-onap-1.0-features</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.0-features-sdc</artifactId>
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
index 43023fe6..9dfe035f 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-checkin
version: onap-1.0
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
index d7a9e375..32f2de93 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-checkout
version: onap-1.1
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
index d5b7432f..3b4ce7b5 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-create
version: onap-1.0
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
index fe494ace..f1fff560 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-list
version: onap-1.0
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
index 99cd88ed..880608c5 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-show
version: onap-1.0
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
index 55ceaf32..4f4e15c0 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-submit
version: onap-1.0
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
index 344dcc9e..d3fc41be 100644
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
+++ b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-upload
version: onap-1.0
diff --git a/plugins/onap-1.0/pom.xml b/plugins/onap-1.0/pom.xml
index 0d583115..400b6e90 100644
--- a/plugins/onap-1.0/pom.xml
+++ b/plugins/onap-1.0/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.0</artifactId>
diff --git a/plugins/onap-1.1/auth/pom.xml b/plugins/onap-1.1/auth/pom.xml
index 481a6bb1..91c3dd28 100644
--- a/plugins/onap-1.1/auth/pom.xml
+++ b/plugins/onap-1.1/auth/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins-onap-1.1</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.1-auth</artifactId>
diff --git a/plugins/onap-1.1/catalog/pom.xml b/plugins/onap-1.1/catalog/pom.xml
index 30a83340..be7aa9ab 100644
--- a/plugins/onap-1.1/catalog/pom.xml
+++ b/plugins/onap-1.1/catalog/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins-onap-1.1</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.1-catalog</artifactId>
diff --git a/plugins/onap-1.1/features/aai/pom.xml b/plugins/onap-1.1/features/aai/pom.xml
index c1856a01..8cf8072f 100644
--- a/plugins/onap-1.1/features/aai/pom.xml
+++ b/plugins/onap-1.1/features/aai/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins-onap-1.1-features</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.1-features-aai</artifactId>
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/service-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml
index 3e5dcc65..97909598 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/service-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: service-list
description: List created service instance
-version: onap-1.1
-service:
- name: aai
- version: v11
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: aai
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: customer-name
@@ -47,6 +46,12 @@ results:
type: string
http:
+ service:
+ name: aai
+ version: v11
+ auth: basic
+ mode: direct
+
request:
uri: /aai/v11/business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}/service-instances
method: GET
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml
index b29f5d0f..0a9fa905 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vf-list
description: List created VF instances for a service instance
-version: onap-1.1
-service:
- name: aai
- version: v11
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: aai
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: customer-name
@@ -41,6 +40,12 @@ results:
type: string
http:
+ service:
+ name: aai
+ version: v11
+ auth: basic
+ mode: direct
+
request:
uri: /aai/v11/business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}/service-instances/service-instance/${service-id}
method: GET
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-show-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml
index 01cb9bd4..c9546dea 100644
--- a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-show-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vf-show
description: Show details for VF
-version: onap-1.1
-service:
- name: aai
- version: v11
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: aai
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: vf-id
@@ -49,6 +48,12 @@ results:
type: string
http:
+ service:
+ name: aai
+ version: v11
+ auth: basic
+ mode: direct
+
request:
uri: /aai/v11/network/generic-vnfs/generic-vnf/${vf-id}
method: GET
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-sample-1.1.yaml
deleted file mode 100644
index 6a5c55c0..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: cloud-create
-version: onap-1.1
-samples:
- sample1:
- name: Create a cloud region in onap
- input: -h https://locahost:8443 -u AAI -p AAI -x abc-xyz -y ABCXYZ25
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json
index 223ebd26..223ebd26 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml
index 9c64395d..406fd941 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: cloud-create
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-sample-1.1.yaml
deleted file mode 100644
index c84b8eca..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: cloud-delete
-version: onap-1.1
-samples:
- sample1:
- name: Delete the cloud region in onap
- input: -h https://locahost:8443 -u AAI -p AAI -x abc-xyz -y ABCXYZ25 -z 1504257554519 \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json
index 85094a9d..85094a9d 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml
index a61523a3..ba123616 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: cloud-delete
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.1.yaml
deleted file mode 100644
index ada90903..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.1.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: cloud-list
-version: onap-1.1
-samples:
- sample1:
- name: List the configured clouds in onap
- input: -h https://locahost:8443 -u AAI -p AAI
- output: |
- +--------------------------------+------------------------------------+------------------+
- |cloud |region |resource-version |
- +--------------------------------+------------------------------------+------------------+
- |example-cloud-owner-val-44086 |example-cloud-region-id-val-67393 |1503503677953 |
- +--------------------------------+------------------------------------+------------------+
- |att-aic |AAIAIC25 |1503380675 |
- +--------------------------------+------------------------------------+------------------+
- |abc-xyz |ABCXYZ25 |1504257554519 |
- +--------------------------------+------------------------------------+------------------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json
index 2e5b1db0..2e5b1db0 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml
index 00342b23..c82e928d 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: cloud-list
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml
deleted file mode 100644
index d5332115..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: customer-create
-version: onap-1.1
-samples:
- sample1:
- name: Create a customer
- input: -h https://locahost:8443 -u AAI -p AAI -x customer-1 -y subscriber-1
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-moco.json
index 18bb05d7..18bb05d7 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-moco.json
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-sample.yaml
index 72273417..8f9f9514 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: customer-create
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-sample-1.1.yaml
deleted file mode 100644
index 9f80da02..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: customer-delete
-version: onap-1.1
-samples:
- sample1:
- name: Delete the customer
- input: -h https://locahost:8443 -u AAI -p AAI -x customer-1 -y 1504085129922
-
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-moco.json
index 26e8a918..26e8a918 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-moco.json
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-sample.yaml
index 7e6f0dcb..f57de5bd 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: customer-delete
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-sample-1.1.yaml
deleted file mode 100644
index feb4d7ce..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-sample-1.1.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: customer-list
-version: onap-1.1
-samples:
- sample1:
- name: List the configured customers in onap
- input: -h https://locahost:8443 -u AAI -p AAI
- output: |
- +--------------------------------------+------------------+
- |name |resource-version |
- +--------------------------------------+------------------+
- |example-global-customer-id-val-8741 |1504017436899 |
- +--------------------------------------+------------------+
- |example-global-customer-id-val-87416 |1504017249493 |
- +--------------------------------------+------------------+
- |customer-1 |1504085129922 |
- +--------------------------------------+------------------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-moco.json
index f7737271..f7737271 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-moco.json
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-sample.yaml
index 7ff64210..19876116 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: customer-list
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-sample-1.1.yaml
deleted file mode 100644
index 8c2e8dbd..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-sample-1.1.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: customer-show
-version: onap-1.1
-samples:
- sample1:
- name: Show complete details of a customer
- input: -h https://locahost:8443 -u AAI -p AAI -x example-global-customer-id-val-8741 --long
- output: |
- +--------------------------------------+----------------------------------+------------------+------------------------------------+
- |name |subscriber-name |resource-version |subscriber-type |
- +--------------------------------------+----------------------------------+------------------+------------------------------------+
- |example-global-customer-id-val-8741 |example-subscriber-name-val-2447 |1504017436899 |example-subscriber-type-val-24368 |
- +--------------------------------------+----------------------------------+------------------+------------------------------------+
- sample2:
- name: Show basic details of a customer
- input: -h https://locahost:8443 -u AAI -p AAI -x example-global-customer-id-val-8741
- output: |
- +--------------------------------------+----------------------------------+
- |name |subscriber-name |
- +--------------------------------------+----------------------------------+
- |example-global-customer-id-val-8741 |example-subscriber-name-val-2447 |
- +--------------------------------------+----------------------------------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-moco.json
index 242db8c1..242db8c1 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-moco.json
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-sample.yaml
index 1669ffd2..5ebbfa91 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: customer-show
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-sample-1.1.yaml
deleted file mode 100644
index 2856ba62..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: ems-register
-version: onap-1.1
-samples:
- sample1:
- name: Create a ems
- input: -z f962fa1e-d439-4b02-a122-cc38fd0da07c -b ems-1 -c OpenStack -e HW -q 1.0 -g http://locahost -i user -j password -x remote-path -d
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-moco.json
index d14653f6..639f3581 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-moco.json
@@ -1,42 +1,42 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/aai/v11/external-system/esr-ems-list/esr-ems/51a480ed-649c-4c47-a84b-f966dc4f9554",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-8552f11b-5e79-4d98-9e05-ccc4e66c42c0",
- "Content-Type" : "application/json"
- },
- "json" : {
- "ems-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554",
- "passive" : true,
- "remote-path" : "sample",
- "esr-system-info-list" : {
- "esr-system-info" : [ {
- "esr-system-info-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554",
- "system-name" : "ems1",
- "type" : "ems",
- "vendor" : "boco",
- "version" : "1.0",
- "service-url" : "http://10.0.0.1",
- "user-name" : "admin",
- "password" : "password",
- "system-type" : "ems",
- "protocal" : "",
- "ssl-cacert" : "",
- "ssl-insecure" : "",
- "ip-address" : "",
- "port" : "",
- "cloud-domain" : "",
- "default-tenant" : ""
- } ]
- }
- }
- },
- "response" : {
- "status" : 201,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/aai/v11/external-system/esr-ems-list/esr-ems/51a480ed-649c-4c47-a84b-f966dc4f9554",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-8552f11b-5e79-4d98-9e05-ccc4e66c42c0",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "ems-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554",
+ "passive" : true,
+ "remote-path" : "sample",
+ "esr-system-info-list" : {
+ "esr-system-info" : [ {
+ "esr-system-info-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554",
+ "system-name" : "ems1",
+ "type" : "ems",
+ "vendor" : "boco",
+ "version" : "1.0",
+ "service-url" : "http://10.0.0.1",
+ "user-name" : "admin",
+ "password" : "password",
+ "system-type" : "ems",
+ "protocal" : "",
+ "ssl-cacert" : "",
+ "ssl-insecure" : "",
+ "ip-address" : "",
+ "port" : "",
+ "cloud-domain" : "",
+ "default-tenant" : ""
+ } ]
+ }
+ }
+ },
+ "response" : {
+ "status" : 201,
+ "json" : null
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml
index accd0567..d086b9ef 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: ems-register
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-sample-1.1.yaml
deleted file mode 100644
index 99a92785..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: ems-unregister
-version: onap-1.1
-samples:
- sample1:
- name: Delete the ems
- input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c -y 1505298922586
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json
index c5d12863..9adbf83d 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json
@@ -1,18 +1,18 @@
-[ {
- "request" : {
- "method" : "delete",
- "uri" : "/aai/v11/external-system/esr-ems-list/esr-ems/51a480ed-649c-4c47-a84b-f966dc4f9554",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-d9a77e12-34be-4d8f-b7da-c749dbc3fc8a",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 204,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "delete",
+ "uri" : "/aai/v11/external-system/esr-ems-list/esr-ems/51a480ed-649c-4c47-a84b-f966dc4f9554",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-d9a77e12-34be-4d8f-b7da-c749dbc3fc8a",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 204,
+ "json" : null
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml
index df4d080a..943d1c79 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: ems-unregister
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-sample-1.1.yaml
deleted file mode 100644
index 88997812..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-sample-1.1.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: ems-list
-version: onap-1.1
-samples:
- sample1:
- name: List all ems
- output: |
- +--------------------------------------+------------------+
- |ems-id |resource-version |
- +--------------------------------------+------------------+
- |f962fa1e-d439-4b02-a122-cc38fd0da07c |1505298922586 |
- +--------------------------------------+------------------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-moco.json
index 4a2f1674..b3b4738c 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-moco.json
@@ -1,23 +1,23 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v11/external-system/esr-ems-list",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-ed3e792b-9436-4ddd-ba76-3684dca3e4cf",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "esr-ems" : [ {
- "ems-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554",
- "resource-version" : "1509095358658"
- } ]
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v11/external-system/esr-ems-list",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-ed3e792b-9436-4ddd-ba76-3684dca3e4cf",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "esr-ems" : [ {
+ "ems-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554",
+ "resource-version" : "1509095358658"
+ } ]
+ }
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml
index 174f4541..0852d506 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml
@@ -1,10 +1,10 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: ems-list
version: onap-1.1
samples:
sample1:
name: ems-list
- input:
+ input:
moco: ems-list-schema-1.1-moco.json
output: |
+--------------------------------------+------------------+
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-sample-1.1.yaml
deleted file mode 100644
index e11753ac..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-sample-1.1.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: ems-show
-version: onap-1.1
-samples:
- sample1:
- name: Show the ems
- input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c -y 1505298922586
- output: |
- +--------+------------+--------+----------+------------------+
- |name |type |vendor |version |url |
- +--------+------------+--------+----------+------------------+
- |ems-1 |OpenStack |HW |1.0 |http://locahost |
- +--------+------------+--------+----------+------------------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-moco.json
index c9c09f97..b6ac827d 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-moco.json
@@ -1,35 +1,35 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v11/external-system/esr-ems-list/esr-ems/51a480ed-649c-4c47-a84b-f966dc4f9554/esr-system-info-list/esr-system-info/51a480ed-649c-4c47-a84b-f966dc4f9554",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-369be4d7-7a6f-4e44-996e-1e65d8129cb4",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "esr-system-info-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554",
- "system-name" : "ems1",
- "type" : "ems",
- "vendor" : "boco",
- "version" : "1.0",
- "service-url" : "http://10.0.0.1",
- "user-name" : "admin",
- "password" : "password",
- "system-type" : "ems",
- "ssl-cacert" : "",
- "ssl-insecure" : false,
- "ip-address" : "",
- "port" : "",
- "cloud-domain" : "",
- "default-tenant" : "",
- "resource-version" : "1509095358847"
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v11/external-system/esr-ems-list/esr-ems/51a480ed-649c-4c47-a84b-f966dc4f9554/esr-system-info-list/esr-system-info/51a480ed-649c-4c47-a84b-f966dc4f9554",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-369be4d7-7a6f-4e44-996e-1e65d8129cb4",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "esr-system-info-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554",
+ "system-name" : "ems1",
+ "type" : "ems",
+ "vendor" : "boco",
+ "version" : "1.0",
+ "service-url" : "http://10.0.0.1",
+ "user-name" : "admin",
+ "password" : "password",
+ "system-type" : "ems",
+ "ssl-cacert" : "",
+ "ssl-insecure" : false,
+ "ip-address" : "",
+ "port" : "",
+ "cloud-domain" : "",
+ "default-tenant" : "",
+ "resource-version" : "1509095358847"
+ }
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml
index 4601cdef..4a42171a 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: ems-show
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-sample-1.1.yaml
deleted file mode 100644
index 3193f6e6..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vim-register
-version: onap-1.1
-samples:
- sample1:
- name: Create a vim under given cloud region
- input: -x cloud-1 -y region-1 -z f962fa1e-d439-4b02-a122-cc38fd0da07b -b vim-1 -c OpenStack -e HW -q 1.0 -g http://locahost -i user -j password -n default -o tenant-1 -d
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-moco.json
index ebbf12ed..01ff5088 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-moco.json
@@ -1,35 +1,35 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list/esr-system-info/810edb5a-42e9-462d-9587-96bc9272ac27",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-bbda56c1-81d6-4a3f-b82f-4c74f9673be7",
- "Content-Type" : "application/json"
- },
- "json" : {
- "esr-system-info-id" : "810edb5a-42e9-462d-9587-96bc9272ac27",
- "system-name" : "vim1",
- "type" : "OpenStack",
- "vendor" : "Devstack",
- "version" : "newton",
- "service-url" : "http://192.168.16.149/identity",
- "user-name" : "onap",
- "password" : "onap",
- "system-type" : "vim",
- "protocal" : "",
- "ssl-cacert" : "",
- "ssl-insecure" : "false",
- "ip-address" : "",
- "port" : "",
- "cloud-domain" : "default",
- "default-tenant" : "onap"
- }
- },
- "response" : {
- "status" : 201,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list/esr-system-info/810edb5a-42e9-462d-9587-96bc9272ac27",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-bbda56c1-81d6-4a3f-b82f-4c74f9673be7",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "esr-system-info-id" : "810edb5a-42e9-462d-9587-96bc9272ac27",
+ "system-name" : "vim1",
+ "type" : "OpenStack",
+ "vendor" : "Devstack",
+ "version" : "newton",
+ "service-url" : "http://192.168.16.149/identity",
+ "user-name" : "onap",
+ "password" : "onap",
+ "system-type" : "vim",
+ "protocal" : "",
+ "ssl-cacert" : "",
+ "ssl-insecure" : "false",
+ "ip-address" : "",
+ "port" : "",
+ "cloud-domain" : "default",
+ "default-tenant" : "onap"
+ }
+ },
+ "response" : {
+ "status" : 201,
+ "json" : null
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml
index e23e61cb..93c8ca2a 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vim-register
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-sample-1.1.yaml
deleted file mode 100644
index 5a1998f4..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vim-unregister
-version: onap-1.1
-samples:
- sample1:
- name: Delete the vim under given cloud region
- input: -x cloud-1 -y region-1 -z f962fa1e-d439-4b02-a122-cc38fd0da07b -b 1505295671538
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json
index 7beabc12..4b5f43d3 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json
@@ -1,18 +1,18 @@
-[ {
- "request" : {
- "method" : "delete",
- "uri" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list/esr-system-info/810edb5a-42e9-462d-9587-96bc9272ac27",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-236b38a5-911c-43db-9740-dd69d2adb755",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 204,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "delete",
+ "uri" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list/esr-system-info/810edb5a-42e9-462d-9587-96bc9272ac27",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-236b38a5-911c-43db-9740-dd69d2adb755",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 204,
+ "json" : null
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml
index fdadc344..4cea61cd 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vim-unregister
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-sample-1.1.yaml
deleted file mode 100644
index d0e6d437..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-sample-1.1.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vim-list
-version: onap-1.1
-samples:
- sample1:
- name: List all vim under given cloud region
- input: -x cloud-1 -y region-1
- output: |
- +--------------------------------------+--------+--------+----------------+------------------+
- |vim-id |name |vendor |default-tenant |resource-version |
- +--------------------------------------+--------+--------+----------------+------------------+
- |f962fa1e-d439-4b02-a122-cc38fd0da07b |vim-1 |HW |tenant-1 |1505295671538 |
- +--------------------------------------+--------+--------+----------------+------------------+
- sample2:
- name: List all vim under given cloud region with complete details
- input: -x cloud-1 -y region-1 --long
- output: |
- +--------------------------------------+--------+------------+--------+----------+------------------+----------+--------------+----------------+------------------+
- |vim-id |name |type |vendor |version |url |username |cloud-domain |default-tenant |resource-version |
- +--------------------------------------+--------+------------+--------+----------+------------------+----------+--------------+----------------+------------------+
- |f962fa1e-d439-4b02-a122-cc38fd0da07b |vim-1 |OpenStack |HW |1.0 |http://locahost |user |default |tenant-1 |1505295671538 |
- +--------------------------------------+--------+------------+--------+----------+------------------+----------+--------------+----------------+------------------+
-
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-moco.json
index 9f687dfa..c9d425b3 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-moco.json
@@ -1,54 +1,54 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-170cf86a-e3df-4940-b361-973aa698e015",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "esr-system-info" : [ {
- "esr-system-info-id" : "acc5e14e-1320-4ab5-97fe-b7cc82ad03f2",
- "system-name" : "RegionOne",
- "type" : "OpenStack",
- "vendor" : "Devstack",
- "version" : "newton",
- "service-url" : "http://192.168.16.149/identity",
- "user-name" : "onap",
- "password" : "onap",
- "system-type" : "vim",
- "ssl-cacert" : "",
- "ssl-insecure" : false,
- "ip-address" : "",
- "port" : "",
- "cloud-domain" : "default",
- "default-tenant" : "onap",
- "resource-version" : "1509093477505"
- }, {
- "esr-system-info-id" : "810edb5a-42e9-462d-9587-96bc9272ac27",
- "system-name" : "vim1",
- "type" : "OpenStack",
- "vendor" : "Devstack",
- "version" : "newton",
- "service-url" : "http://192.168.16.149/identity",
- "user-name" : "onap",
- "password" : "onap",
- "system-type" : "vim",
- "ssl-cacert" : "",
- "ssl-insecure" : false,
- "ip-address" : "",
- "port" : "",
- "cloud-domain" : "default",
- "default-tenant" : "onap",
- "resource-version" : "1509093590932"
- } ]
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-170cf86a-e3df-4940-b361-973aa698e015",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "esr-system-info" : [ {
+ "esr-system-info-id" : "acc5e14e-1320-4ab5-97fe-b7cc82ad03f2",
+ "system-name" : "RegionOne",
+ "type" : "OpenStack",
+ "vendor" : "Devstack",
+ "version" : "newton",
+ "service-url" : "http://192.168.16.149/identity",
+ "user-name" : "onap",
+ "password" : "onap",
+ "system-type" : "vim",
+ "ssl-cacert" : "",
+ "ssl-insecure" : false,
+ "ip-address" : "",
+ "port" : "",
+ "cloud-domain" : "default",
+ "default-tenant" : "onap",
+ "resource-version" : "1509093477505"
+ }, {
+ "esr-system-info-id" : "810edb5a-42e9-462d-9587-96bc9272ac27",
+ "system-name" : "vim1",
+ "type" : "OpenStack",
+ "vendor" : "Devstack",
+ "version" : "newton",
+ "service-url" : "http://192.168.16.149/identity",
+ "user-name" : "onap",
+ "password" : "onap",
+ "system-type" : "vim",
+ "ssl-cacert" : "",
+ "ssl-insecure" : false,
+ "ip-address" : "",
+ "port" : "",
+ "cloud-domain" : "default",
+ "default-tenant" : "onap",
+ "resource-version" : "1509093590932"
+ } ]
+ }
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml
index 50f4eb3a..d3517fa6 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vim-list
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-sample-1.1.yaml
deleted file mode 100644
index 54944d41..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vnfm-register
-version: onap-1.1
-samples:
- sample1:
- name: Create a vnfm
- input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c -y f962fa1e-d439-4b02-a122-cc38fd0da07c -b vnfm-2 -c OpenStack -e HW -q 1.0 -g http://locahost -i user -j password -d
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json
index d43db5b9..b5091ecc 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json
@@ -1,42 +1,42 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/aai/v11/external-system/esr-vnfm-list/esr-vnfm/c0ecd788-22f4-49a4-a969-68051cd517e7",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-99986f20-ae09-41f7-95a3-a962cda7b24e",
- "Content-Type" : "application/json"
- },
- "json" : {
- "vnfm-id" : "c0ecd788-22f4-49a4-a969-68051cd517e7",
- "vim-id" : "acc5e14e-1320-4ab5-97fe-b7cc82ad03f2",
- "certificate-url" : "",
- "esr-system-info-list" : {
- "esr-system-info" : [ {
- "esr-system-info-id" : "c0ecd788-22f4-49a4-a969-68051cd517e7",
- "system-name" : "vnfm1",
- "type" : "OpenStack",
- "vendor" : "ONAP",
- "version" : "1.0",
- "service-url" : "http://10.0.1.1",
- "user-name" : "admin",
- "password" : "password",
- "system-type" : "vnfm",
- "protocal" : "",
- "ssl-cacert" : "",
- "ssl-insecure" : "",
- "ip-address" : "",
- "port" : "",
- "cloud-domain" : "",
- "default-tenant" : ""
- } ]
- }
- }
- },
- "response" : {
- "status" : 201,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/aai/v11/external-system/esr-vnfm-list/esr-vnfm/c0ecd788-22f4-49a4-a969-68051cd517e7",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-99986f20-ae09-41f7-95a3-a962cda7b24e",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "vnfm-id" : "c0ecd788-22f4-49a4-a969-68051cd517e7",
+ "vim-id" : "acc5e14e-1320-4ab5-97fe-b7cc82ad03f2",
+ "certificate-url" : "",
+ "esr-system-info-list" : {
+ "esr-system-info" : [ {
+ "esr-system-info-id" : "c0ecd788-22f4-49a4-a969-68051cd517e7",
+ "system-name" : "vnfm1",
+ "type" : "OpenStack",
+ "vendor" : "ONAP",
+ "version" : "1.0",
+ "service-url" : "http://10.0.1.1",
+ "user-name" : "admin",
+ "password" : "password",
+ "system-type" : "vnfm",
+ "protocal" : "",
+ "ssl-cacert" : "",
+ "ssl-insecure" : "",
+ "ip-address" : "",
+ "port" : "",
+ "cloud-domain" : "",
+ "default-tenant" : ""
+ } ]
+ }
+ }
+ },
+ "response" : {
+ "status" : 201,
+ "json" : null
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml
index 411efcbe..98dbb1da 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vnfm-register
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-sample-1.1.yaml
deleted file mode 100644
index c6a79730..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vnfm-unregister
-version: onap-1.1
-samples:
- sample1:
- name: Delete the vnfm
- input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c -y 1505298922586
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json
index 9e31836d..01248fc7 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json
@@ -1,18 +1,18 @@
-[ {
- "request" : {
- "method" : "delete",
- "uri" : "/aai/v11/external-system/esr-vnfm-list/esr-vnfm/c0ecd788-22f4-49a4-a969-68051cd517e7",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-c47a3c8f-ac92-4847-98b8-399707379a67",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 204,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "delete",
+ "uri" : "/aai/v11/external-system/esr-vnfm-list/esr-vnfm/c0ecd788-22f4-49a4-a969-68051cd517e7",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-c47a3c8f-ac92-4847-98b8-399707379a67",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 204,
+ "json" : null
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml
index e58a20fb..7e436fbf 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vnfm-unregister
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-sample-1.1.yaml
deleted file mode 100644
index e3a080ed..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-sample-1.1.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vnfm-list
-version: onap-1.1
-samples:
- sample1:
- name: List all vnfm
- output: |
- +--------------------------------------+--------------------------------------+------------------------------------+------------------+
- |vnfm-id |vim-id |certificate-url |resource-version |
- +--------------------------------------+--------------------------------------+------------------------------------+------------------+
- |f962fa1e-d439-4b02-a122-cc38fd0da07c |f962fa1e-d439-4b02-a122-cc38fd0da07c | |1505299563540 |
- +--------------------------------------+--------------------------------------+------------------------------------+------------------+
- |htipl913-vnfm-id-val-44685 |example-vim-id-val-36801 |example-certificate-url-val-70931 |1505283495503 |
- +--------------------------------------+--------------------------------------+------------------------------------+------------------+
-
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json
index 5cfa56b5..246f2dd2 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json
@@ -1,25 +1,25 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v11/external-system/esr-vnfm-list",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-07be51f0-22b4-4ea0-a098-bf68ed59f2ce",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "esr-vnfm" : [ {
- "vnfm-id" : "c0ecd788-22f4-49a4-a969-68051cd517e7",
- "vim-id" : "acc5e14e-1320-4ab5-97fe-b7cc82ad03f2",
- "certificate-url" : "",
- "resource-version" : "1509094328901"
- } ]
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v11/external-system/esr-vnfm-list",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-07be51f0-22b4-4ea0-a098-bf68ed59f2ce",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "esr-vnfm" : [ {
+ "vnfm-id" : "c0ecd788-22f4-49a4-a969-68051cd517e7",
+ "vim-id" : "acc5e14e-1320-4ab5-97fe-b7cc82ad03f2",
+ "certificate-url" : "",
+ "resource-version" : "1509094328901"
+ } ]
+ }
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml
index eab55c2e..5967b953 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml
@@ -1,10 +1,10 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vnfm-list
version: onap-1.1
samples:
sample1:
name: vnfm-list
- input:
+ input:
moco: vnfm-list-schema-1.1-moco.json
output: |
+--------------------------------------+--------------------------------------+------------------+------------------+
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-sample-1.1.yaml
deleted file mode 100644
index 35c38d2b..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-sample-1.1.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vnfm-show
-version: onap-1.1
-samples:
- sample1:
- name: Show the vnfm
- input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c
- output: |
- +----------+------------------+
- |property |value |
- +----------+------------------+
- |name |vnfm-2 |
- +----------+------------------+
- |type |OpenStack |
- +----------+------------------+
- |vendor |HW |
- +----------+------------------+
- |version |1.0 |
- +----------+------------------+
- |url |http://locahost |
- +----------+------------------+
-
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json
index 9eb10b3c..1b34db2f 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json
@@ -1,35 +1,35 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v11/external-system/esr-vnfm-list/esr-vnfm/c0ecd788-22f4-49a4-a969-68051cd517e7/esr-system-info-list/esr-system-info/c0ecd788-22f4-49a4-a969-68051cd517e7",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-c87981f1-c110-4d29-887e-12e44b96507c",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "esr-system-info-id" : "c0ecd788-22f4-49a4-a969-68051cd517e7",
- "system-name" : "vnfm1",
- "type" : "OpenStack",
- "vendor" : "ONAP",
- "version" : "1.0",
- "service-url" : "http://10.0.1.1",
- "user-name" : "admin",
- "password" : "password",
- "system-type" : "vnfm",
- "ssl-cacert" : "",
- "ssl-insecure" : false,
- "ip-address" : "",
- "port" : "",
- "cloud-domain" : "",
- "default-tenant" : "",
- "resource-version" : "1509094329093"
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v11/external-system/esr-vnfm-list/esr-vnfm/c0ecd788-22f4-49a4-a969-68051cd517e7/esr-system-info-list/esr-system-info/c0ecd788-22f4-49a4-a969-68051cd517e7",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-c87981f1-c110-4d29-887e-12e44b96507c",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "esr-system-info-id" : "c0ecd788-22f4-49a4-a969-68051cd517e7",
+ "system-name" : "vnfm1",
+ "type" : "OpenStack",
+ "vendor" : "ONAP",
+ "version" : "1.0",
+ "service-url" : "http://10.0.1.1",
+ "user-name" : "admin",
+ "password" : "password",
+ "system-type" : "vnfm",
+ "ssl-cacert" : "",
+ "ssl-insecure" : false,
+ "ip-address" : "",
+ "port" : "",
+ "cloud-domain" : "",
+ "default-tenant" : "",
+ "resource-version" : "1509094329093"
+ }
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml
index c79921f7..071a4cc7 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vnfm-show
version: onap-1.1
samples:
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-moco.json
index e9a1d529..e9a1d529 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-moco.json
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-sample.yaml
index 2cda799b..20038dc7 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-list
version: onap-1.1
samples:
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-moco.json
index 096b5992..096b5992 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-moco.json
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml
index b93b9d16..f0ac7a1b 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vf-list
version: onap-1.1
samples:
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-moco.json
index 3d697e03..3d697e03 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-moco.json
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml
index 365affcf..e0d380c7 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vf-show
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-sample-1.1.yaml
deleted file mode 100644
index a9d01569..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: service-type-create
-version: onap-1.1
-samples:
- sample1:
- name: Create a service type
- input: -h https://locahost:8443 -u AAI -p AAI -x vTest -y 26ab7af6-96cc-4c4e-814a-e533af4ef9f6
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-moco.json
index 5e54f153..d41ec6e3 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-moco.json
@@ -1,21 +1,21 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/aai/v11/service-design-and-creation/services/service/de1fa33f-f676-42e5-b79a-a39825c19b1d",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-db81a881-11a9-4eca-9611-e0abdfa81597",
- "Content-Type" : "application/json"
- },
- "json" : {
- "service-description" : "test",
- "service-id" : "de1fa33f-f676-42e5-b79a-a39825c19b1d"
- }
- },
- "response" : {
- "status" : 201,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/aai/v11/service-design-and-creation/services/service/de1fa33f-f676-42e5-b79a-a39825c19b1d",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-db81a881-11a9-4eca-9611-e0abdfa81597",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "service-description" : "test",
+ "service-id" : "de1fa33f-f676-42e5-b79a-a39825c19b1d"
+ }
+ },
+ "response" : {
+ "status" : 201,
+ "json" : null
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml
index c0ccdc83..b3a629c4 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-type-create
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-sample-1.1.yaml
deleted file mode 100644
index 46626a29..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: service-type-delete
-version: onap-1.1
-samples:
- sample1:
- name: Delete the service type
- input: -h https://locahost:8443 -u AAI -p AAI -x 26ab7af6-96cc-4c4e-814a-e533af4ef9f6 -y 1504086172338
-
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-moco.json
index 961e3a90..682d32f1 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-moco.json
@@ -1,18 +1,18 @@
-[ {
- "request" : {
- "method" : "delete",
- "uri" : "/aai/v11/service-design-and-creation/services/service/de1fa33f-f676-42e5-b79a-a39825c19b1d",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-41247f9a-4124-4b09-b7e1-045a74e610fb",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 204,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "delete",
+ "uri" : "/aai/v11/service-design-and-creation/services/service/de1fa33f-f676-42e5-b79a-a39825c19b1d",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-41247f9a-4124-4b09-b7e1-045a74e610fb",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 204,
+ "json" : null
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml
index a5c2841f..498b60a0 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-type-delete
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-sample-1.1.yaml
deleted file mode 100644
index 01ef2b93..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-sample-1.1.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: service-type-list
-version: onap-1.1
-samples:
- sample1:
- name: List the configured service types in onap
- input: -h https://locahost:8443 -u AAI -p AAI
- output: |
- +--------------------------------------+--------------+------------------+
- |service-type-id |service-type |resource-version |
- +--------------------------------------+--------------+------------------+
- |26ab7af6-96cc-4c4e-814a-e533af4ef9f6 |vTest |1504086172338 |
- +--------------------------------------+--------------+------------------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-moco.json
index 52ced9b0..337d445e 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-moco.json
@@ -1,44 +1,44 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v11/service-design-and-creation/services",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-aded3320-855c-46f6-8c28-1a14413c0585",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "service" : [ {
- "service-id" : "2733fe6f-8725-48fa-8609-092a34106dba",
- "service-description" : "vIMS",
- "resource-version" : "1508827920395"
- }, {
- "service-id" : "bc549d9d-2335-4b07-9f03-3a85439c0bbb",
- "service-description" : "vFW-kanag",
- "resource-version" : "1509029699189"
- }, {
- "service-id" : "de1fa33f-f676-42e5-b79a-a39825c19b1d",
- "service-description" : "test",
- "resource-version" : "1509029708094"
- }, {
- "service-id" : "1482d2f2-b9e6-4421-a2f6-31959278db6f",
- "service-description" : "vCPE",
- "resource-version" : "1508827919819"
- }, {
- "service-id" : "4426c557-e012-47eb-85cc-6128fa4f55c1",
- "service-description" : "vLB",
- "resource-version" : "1508827918467"
- }, {
- "service-id" : "dd04cc4b-6283-480d-8c5a-2c7bba8497ea",
- "service-description" : "vFW",
- "resource-version" : "1508827917148"
- } ]
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v11/service-design-and-creation/services",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-aded3320-855c-46f6-8c28-1a14413c0585",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "service" : [ {
+ "service-id" : "2733fe6f-8725-48fa-8609-092a34106dba",
+ "service-description" : "vIMS",
+ "resource-version" : "1508827920395"
+ }, {
+ "service-id" : "bc549d9d-2335-4b07-9f03-3a85439c0bbb",
+ "service-description" : "vFW-kanag",
+ "resource-version" : "1509029699189"
+ }, {
+ "service-id" : "de1fa33f-f676-42e5-b79a-a39825c19b1d",
+ "service-description" : "test",
+ "resource-version" : "1509029708094"
+ }, {
+ "service-id" : "1482d2f2-b9e6-4421-a2f6-31959278db6f",
+ "service-description" : "vCPE",
+ "resource-version" : "1508827919819"
+ }, {
+ "service-id" : "4426c557-e012-47eb-85cc-6128fa4f55c1",
+ "service-description" : "vLB",
+ "resource-version" : "1508827918467"
+ }, {
+ "service-id" : "dd04cc4b-6283-480d-8c5a-2c7bba8497ea",
+ "service-description" : "vFW",
+ "resource-version" : "1508827917148"
+ } ]
+ }
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml
index 081a42b1..3baaef37 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-type-list
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-sample-1.1.yaml
deleted file mode 100644
index b33cf597..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: subscription-create
-version: onap-1.1
-samples:
- sample1:
- name: Create a subscription
- input: -h https://locahost:8443 -u AAI -p AAI -x customer-4 -y subscriber-4 -z abc-xyz -r ABCXYZ25 -c 8bcf4466-b092-473f-889b-7f40efb5a323 -e vTest
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-moco.json
index 13ec1e2b..0839ead0 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-moco.json
@@ -1,35 +1,35 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/aai/v11/business/customers/customer/kanag/service-subscriptions/service-subscription/vFW-kanag",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-2f281cd8-98da-4cb5-899e-294d9bf7b03d",
- "Content-Type" : "application/json"
- },
- "json" : {
- "relationship-list" : {
- "relationship" : [ {
- "related-to" : "tenant",
- "relationship-data" : [ {
- "relationship-key" : "cloud-region.cloud-owner",
- "relationship-value" : "huawei-cloud"
- }, {
- "relationship-key" : "cloud-region.cloud-region-id",
- "relationship-value" : "bangalore"
- }, {
- "relationship-key" : "tenant.tenant-id",
- "relationship-value" : "e18173e6-6a13-4614-a13c-3859e7321103"
- } ]
- } ]
- },
- "service-type" : "vFW-kanag"
- }
- },
- "response" : {
- "status" : 201,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/aai/v11/business/customers/customer/kanag/service-subscriptions/service-subscription/vFW-kanag",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-2f281cd8-98da-4cb5-899e-294d9bf7b03d",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "relationship-list" : {
+ "relationship" : [ {
+ "related-to" : "tenant",
+ "relationship-data" : [ {
+ "relationship-key" : "cloud-region.cloud-owner",
+ "relationship-value" : "huawei-cloud"
+ }, {
+ "relationship-key" : "cloud-region.cloud-region-id",
+ "relationship-value" : "bangalore"
+ }, {
+ "relationship-key" : "tenant.tenant-id",
+ "relationship-value" : "e18173e6-6a13-4614-a13c-3859e7321103"
+ } ]
+ } ]
+ },
+ "service-type" : "vFW-kanag"
+ }
+ },
+ "response" : {
+ "status" : 201,
+ "json" : null
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml
index facdcc77..ce5ca345 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: subscription-create
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-sample-1.1.yaml
deleted file mode 100644
index 3a040d7e..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: subscription-delete
-version: onap-1.1
-samples:
- sample1:
- name: Delete the subscription
- input: -h https://locahost:8443 -u AAI -p AAI -x customer-4 -y vTest -g 1504258356743
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-moco.json
index bcbd8451..302ea818 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-moco.json
@@ -1,18 +1,18 @@
-[ {
- "request" : {
- "method" : "delete",
- "uri" : "/aai/v11//business/customers/customer/kanag/service-subscriptions/service-subscription/vFW-kanag",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-64fc35d5-c804-4e92-befd-0c695a77e12d",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 204,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "delete",
+ "uri" : "/aai/v11//business/customers/customer/kanag/service-subscriptions/service-subscription/vFW-kanag",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-64fc35d5-c804-4e92-befd-0c695a77e12d",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 204,
+ "json" : null
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml
index f4b16b54..c70d3f9b 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: subscription-delete
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-sample-1.1.yaml
deleted file mode 100644
index 98880aad..00000000
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-sample-1.1.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: subscription-list
-version: onap-1.1
-samples:
- sample1:
- name: List the configured subscription in onap for a given customer
- input: -h https://locahost:8443 -u AAI -p AAI -x customer-4
- output: |
- +--------------+------------------+
- |service-type |resource-version |
- +--------------+------------------+
- |vTest |1504258356743 |
- +--------------+------------------+
-
-
- sample2:
- name: List the configured subscription in onap for a given customer with complete details
- input: -h https://locahost:8443 -u AAI -p AAI -x customer-4 --long
- output: |
- +--------------+------------------+--------------------------------------+----------+----------+
- |service-type |resource-version |tenant |region |cloud |
- +--------------+------------------+--------------------------------------+----------+----------+
- |vTest |1505276255854 |3853ca3c-3bc3-4500-9ddf-08e8cca5493f |region-1 |cloud-1 |
- +--------------+------------------+--------------------------------------+----------+----------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-moco.json b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-moco.json
index a70ce4e0..9565db34 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-moco.json
@@ -1,43 +1,43 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v11/business/customers/customer/kanag/service-subscriptions",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-fd86411d-c6ea-4af5-a4f8-2296587b832b",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "service-subscription" : [ {
- "service-type" : "vFW-kanag",
- "resource-version" : "1509079144326",
- "relationship-list" : {
- "relationship" : [ {
- "related-to" : "tenant",
- "related-link" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/tenants/tenant/e18173e6-6a13-4614-a13c-3859e7321103",
- "relationship-data" : [ {
- "relationship-key" : "cloud-region.cloud-owner",
- "relationship-value" : "huawei-cloud"
- }, {
- "relationship-key" : "cloud-region.cloud-region-id",
- "relationship-value" : "bangalore"
- }, {
- "relationship-key" : "tenant.tenant-id",
- "relationship-value" : "e18173e6-6a13-4614-a13c-3859e7321103"
- } ],
- "related-to-property" : [ {
- "property-key" : "tenant.tenant-name",
- "property-value" : "kanag-tenant"
- } ]
- } ]
- }
- } ]
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v11/business/customers/customer/kanag/service-subscriptions",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-fd86411d-c6ea-4af5-a4f8-2296587b832b",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "service-subscription" : [ {
+ "service-type" : "vFW-kanag",
+ "resource-version" : "1509079144326",
+ "relationship-list" : {
+ "relationship" : [ {
+ "related-to" : "tenant",
+ "related-link" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/tenants/tenant/e18173e6-6a13-4614-a13c-3859e7321103",
+ "relationship-data" : [ {
+ "relationship-key" : "cloud-region.cloud-owner",
+ "relationship-value" : "huawei-cloud"
+ }, {
+ "relationship-key" : "cloud-region.cloud-region-id",
+ "relationship-value" : "bangalore"
+ }, {
+ "relationship-key" : "tenant.tenant-id",
+ "relationship-value" : "e18173e6-6a13-4614-a13c-3859e7321103"
+ } ],
+ "related-to-property" : [ {
+ "property-key" : "tenant.tenant-name",
+ "property-value" : "kanag-tenant"
+ } ]
+ } ]
+ }
+ } ]
+ }
+ }
} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml
index eb823673..cec6ba41 100644
--- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: subscription-list
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml
index 8a2da490..e824b149 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: tenant-create
version: onap-1.1
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml
index 44026ec3..42447ecb 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: tenant-delete
version: onap-1.1
diff --git a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml
index 4348f6eb..72b48a6e 100644
--- a/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: tenant-list
version: onap-1.1
diff --git a/plugins/onap-1.1/features/msb/pom.xml b/plugins/onap-1.1/features/msb/pom.xml
index c67ff7b2..66bf0db0 100644
--- a/plugins/onap-1.1/features/msb/pom.xml
+++ b/plugins/onap-1.1/features/msb/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins-onap-1.1-features</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.1-features-msb</artifactId>
diff --git a/plugins/msb/src/test/resources/onap-cli-sample/microservice-create-schema-moco.json b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-moco.json
index d2b703d0..d2b703d0 100644
--- a/plugins/msb/src/test/resources/onap-cli-sample/microservice-create-schema-moco.json
+++ b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-moco.json
diff --git a/plugins/msb/src/test/resources/onap-cli-sample/microservice-create-schema-sample.yaml b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-sample.yaml
index 7d7c3d21..87c1c457 100644
--- a/plugins/msb/src/test/resources/onap-cli-sample/microservice-create-schema-sample.yaml
+++ b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: microservice-create
version: onap-1.1
samples:
diff --git a/plugins/msb/src/test/resources/onap-cli-sample/microservice-delete-schema-moco.json b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-moco.json
index 0c3d7e82..0c3d7e82 100644
--- a/plugins/msb/src/test/resources/onap-cli-sample/microservice-delete-schema-moco.json
+++ b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-moco.json
diff --git a/plugins/msb/src/test/resources/onap-cli-sample/microservice-delete-schema-sample.yaml b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-sample.yaml
index 1493fa2f..4fcd9f82 100644
--- a/plugins/msb/src/test/resources/onap-cli-sample/microservice-delete-schema-sample.yaml
+++ b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: microservice-delete
version: onap-1.1
@@ -8,4 +8,3 @@ samples:
input: --service-name test --service-version v1 --host-url http://192.168.17.23:80 --node-ip 23.14.15.156 --node-port 80
moco: microservice-delete-schema-moco.json
output:
- \ No newline at end of file
diff --git a/plugins/msb/src/test/resources/onap-cli-sample/microservice-list-schema-moco.json b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-moco.json
index 7b7258cd..b836183d 100644
--- a/plugins/msb/src/test/resources/onap-cli-sample/microservice-list-schema-moco.json
+++ b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-moco.json
@@ -1,1335 +1,1335 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/api/microservices/v1/services",
- "headers" : {
- "Accept" : "application/json",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : [ {
- "serviceName" : "aai-actions",
- "version" : "v11",
- "url" : "/aai/v11/actions",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-actions_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-actions-deprecated",
- "version" : "v11",
- "url" : "/aai/v11/actions",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/aai/v11/actions",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-actions-deprecated_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-business",
- "version" : "v11",
- "url" : "/aai/v11/business",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-business_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-business-deprecated",
- "version" : "v11",
- "url" : "/aai/v11/business",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/aai/v11/business",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-business-deprecated_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-cloudInfrastructure",
- "version" : "v11",
- "url" : "/aai/v11/cloud-infrastructure",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-cloudInfrastructure_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-cloudInfrastructure-deprecated",
- "version" : "v11",
- "url" : "/aai/v11/cloud-infrastructure",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/aai/v11/cloud-infrastructure",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-cloudInfrastructure-deprecated_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-esr-gui",
- "version" : "v1",
- "url" : "/esr-gui",
- "protocol" : "UI",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/iui/aai-esr-gui",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "9519",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-esr-gui_10.0.14.1_9519",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-esr-server",
- "version" : "v1",
- "url" : "/api/aai-esr-server/v1",
- "protocol" : "REST",
- "visualRange" : "0|1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "172.17.0.5",
- "port" : "9518",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-esr-server_172.17.0.5_9518",
- "status" : "passing"
- }, {
- "ip" : "10.0.14.1",
- "port" : "9518",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-esr-server_10.0.14.1_9518",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-externalSystem",
- "version" : "v11",
- "url" : "/aai/v11/external-system",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-externalSystem_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-externalSystem-deprecated",
- "version" : "v11",
- "url" : "/aai/v11/external-system",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/aai/v11/external-system",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-externalSystem-deprecated_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-network",
- "version" : "v11",
- "url" : "/aai/v11/network",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-network_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-network-deprecated",
- "version" : "v11",
- "url" : "/aai/v11/network",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/aai/v11/network",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-network-deprecated_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-search",
- "version" : "v11",
- "url" : "/aai/v11/search",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-search_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-search-deprecated",
- "version" : "v11",
- "url" : "/aai/v11/search",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/aai/v11/search",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-search-deprecated_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-service-design-and-creation",
- "version" : "v11",
- "url" : "/aai/v11/service-design-and-creation",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-service-design-and-creation_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "aai-service-design-and-creation-deprecated",
- "version" : "v11",
- "url" : "/aai/v11/service-design-and-creation",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/aai/v11/service-design-and-creation",
- "enable_ssl" : true,
- "nodes" : [ {
- "ip" : "10.0.1.1",
- "port" : "8443",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_aai-service-design-and-creation-deprecated_10.0.1.1_8443",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "activiti",
- "version" : "v1",
- "url" : "/api/activiti/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "8804",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_activiti_10.0.14.1_8804",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "activiti-rest",
- "version" : "v1",
- "url" : "/activiti-rest",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/activiti-rest",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "8804",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_activiti-rest_10.0.14.1_8804",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "catalog",
- "version" : "v1",
- "url" : "/api/catalog/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "172.17.0.15",
- "port" : "8806",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_catalog_172.17.0.15_8806",
- "status" : "passing"
- }, {
- "ip" : "10.0.14.1",
- "port" : "8806",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_catalog_10.0.14.1_8806",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "emsdriver",
- "version" : "v1",
- "url" : "/api/emsdriver/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "8206",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_emsdriver_10.0.14.1_8206",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "gvnfmdriver",
- "version" : "v1",
- "url" : "/api/gvnfmdriver/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "172.17.0.17",
- "port" : "8484",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_gvnfmdriver_172.17.0.17_8484",
- "status" : "passing"
- }, {
- "ip" : "10.0.14.1",
- "port" : "8484",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_gvnfmdriver_10.0.14.1_8484",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "huaweivnfmdriver",
- "version" : "v1",
- "url" : "/api/huaweivnfmdriver/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "8482",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_huaweivnfmdriver_10.0.14.1_8482",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "jujuvnfmdriver",
- "version" : "v1",
- "url" : "/api/jujuvnfmdriver/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "8483",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_jujuvnfmdriver_10.0.14.1_8483",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "multicloud",
- "version" : "v0",
- "url" : "/api/multicloud/v0",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "9001",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_multicloud_10.0.14.1_9001",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "multicloud-ocata",
- "version" : "v0",
- "url" : "/api/multicloud-ocata/v0",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "9006",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_multicloud-ocata_10.0.14.1_9006",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "multicloud-titanium_cloud",
- "version" : "v0",
- "url" : "/api/multicloud-titanium_cloud/v0",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "9005",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_multicloud-titanium_cloud_10.0.14.1_9005",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "multicloud-vio",
- "version" : "v0",
- "url" : "/api/multicloud-vio/v0",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "9004",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_multicloud-vio_10.0.14.1_9004",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "nokia-vnfm-driver",
- "version" : "v1",
- "url" : "/api/nokiavnfmdriver/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "172.17.0.27",
- "port" : "8486",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_nokia-vnfm-driver_172.17.0.27_8486",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "nokiavnfmdriver",
- "version" : "v1",
- "url" : "/api/nokiavnfmdriver/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "8485",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_nokiavnfmdriver_10.0.14.1_8485",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "nslcm",
- "version" : "v1",
- "url" : "/api/nslcm/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "172.17.0.20",
- "port" : "8403",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_nslcm_172.17.0.20_8403",
- "status" : "passing"
- }, {
- "ip" : "10.0.14.1",
- "port" : "8403",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_nslcm_10.0.14.1_8403",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "policy-pdp",
- "version" : "v1",
- "url" : "/pdp",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.6.1",
- "port" : "8081",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_policy-pdp_10.0.6.1_8081",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "policy-pdp-deprecated",
- "version" : "v1",
- "url" : "/pdp",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/pdp",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.6.1",
- "port" : "8081",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_policy-pdp-deprecated_10.0.6.1_8081",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "portal",
- "version" : "v2",
- "url" : "/",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.9.1",
- "port" : "8989",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_portal_10.0.9.1_8989",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "resmgr",
- "version" : "v1",
- "url" : "/api/resmgr/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "8480",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_resmgr_10.0.14.1_8480",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "sdc",
- "version" : "v1",
- "url" : "/sdc/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.3.1",
- "port" : "8080",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_sdc_10.0.3.1_8080",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "sdc-deprecated",
- "version" : "v1",
- "url" : "/sdc/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/sdc/v1",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.3.1",
- "port" : "8080",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_sdc-deprecated_10.0.3.1_8080",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "sdnc",
- "version" : "v1",
- "url" : "/restconf",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/restconf",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.7.1",
- "port" : "8282",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_sdnc_10.0.7.1_8282",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "so",
- "version" : "v1",
- "url" : "/ecomp/mso/infra",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.5.1",
- "port" : "8080",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_so_10.0.5.1_8080",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "so-deprecated",
- "version" : "v1",
- "url" : "/ecomp/mso/infra",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/ecomp/mso/infra",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.5.1",
- "port" : "8080",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_so-deprecated_10.0.5.1_8080",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "usecase-ui",
- "version" : "v1",
- "url" : "/usecase-ui",
- "protocol" : "UI",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "172.17.0.11",
- "port" : "8080",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_usecase-ui_172.17.0.11_8080",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "usecaseui",
- "version" : "v1",
- "url" : "/api/usecaseui/server/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "8901",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_usecaseui_10.0.14.1_8901",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "usecaseui-gui",
- "version" : "v1",
- "url" : "/iui/usecaseui",
- "protocol" : "UI",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/iui/usecaseui",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "8900",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_usecaseui-gui_10.0.14.1_8900",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "vnflcm",
- "version" : "v1",
- "url" : "/api/vnflcm/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "8801",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_vnflcm_10.0.14.1_8801",
- "status" : "passing"
- }, {
- "ip" : "172.17.0.22",
- "port" : "8801",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_vnflcm_172.17.0.22_8801",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "vnfmgr",
- "version" : "v1",
- "url" : "/api/vnfmgr/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "172.17.0.23",
- "port" : "8803",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_vnfmgr_172.17.0.23_8803",
- "status" : "passing"
- }, {
- "ip" : "10.0.14.1",
- "port" : "8803",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_vnfmgr_10.0.14.1_8803",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "vnfres",
- "version" : "v1",
- "url" : "/api/vnfres/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "172.17.0.24",
- "port" : "8802",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_vnfres_172.17.0.24_8802",
- "status" : "passing"
- }, {
- "ip" : "10.0.14.1",
- "port" : "8802",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_vnfres_10.0.14.1_8802",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "workflow",
- "version" : "v1",
- "url" : "/api/workflow/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "8805",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_workflow_10.0.14.1_8805",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "ztesdncdriver",
- "version" : "v1",
- "url" : "/api/ztesdncdriver/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "172.17.0.25",
- "port" : "8411",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_ztesdncdriver_172.17.0.25_8411",
- "status" : "passing"
- }, {
- "ip" : "10.0.14.1",
- "port" : "8411",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_ztesdncdriver_10.0.14.1_8411",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }, {
- "serviceName" : "ztevmanagerdriver",
- "version" : "v1",
- "url" : "/api/ztevmanagerdriver/v1",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.14.1",
- "port" : "8410",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_ztevmanagerdriver_10.0.14.1_8410",
- "status" : "passing"
- }, {
- "ip" : "172.17.0.26",
- "port" : "8410",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_ztevmanagerdriver_172.17.0.26_8410",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- } ]
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/api/microservices/v1/services",
+ "headers" : {
+ "Accept" : "application/json",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : [ {
+ "serviceName" : "aai-actions",
+ "version" : "v11",
+ "url" : "/aai/v11/actions",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-actions_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-actions-deprecated",
+ "version" : "v11",
+ "url" : "/aai/v11/actions",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/aai/v11/actions",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-actions-deprecated_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-business",
+ "version" : "v11",
+ "url" : "/aai/v11/business",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-business_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-business-deprecated",
+ "version" : "v11",
+ "url" : "/aai/v11/business",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/aai/v11/business",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-business-deprecated_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-cloudInfrastructure",
+ "version" : "v11",
+ "url" : "/aai/v11/cloud-infrastructure",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-cloudInfrastructure_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-cloudInfrastructure-deprecated",
+ "version" : "v11",
+ "url" : "/aai/v11/cloud-infrastructure",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/aai/v11/cloud-infrastructure",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-cloudInfrastructure-deprecated_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-esr-gui",
+ "version" : "v1",
+ "url" : "/esr-gui",
+ "protocol" : "UI",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/iui/aai-esr-gui",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "9519",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-esr-gui_10.0.14.1_9519",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-esr-server",
+ "version" : "v1",
+ "url" : "/api/aai-esr-server/v1",
+ "protocol" : "REST",
+ "visualRange" : "0|1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "172.17.0.5",
+ "port" : "9518",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-esr-server_172.17.0.5_9518",
+ "status" : "passing"
+ }, {
+ "ip" : "10.0.14.1",
+ "port" : "9518",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-esr-server_10.0.14.1_9518",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-externalSystem",
+ "version" : "v11",
+ "url" : "/aai/v11/external-system",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-externalSystem_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-externalSystem-deprecated",
+ "version" : "v11",
+ "url" : "/aai/v11/external-system",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/aai/v11/external-system",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-externalSystem-deprecated_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-network",
+ "version" : "v11",
+ "url" : "/aai/v11/network",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-network_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-network-deprecated",
+ "version" : "v11",
+ "url" : "/aai/v11/network",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/aai/v11/network",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-network-deprecated_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-search",
+ "version" : "v11",
+ "url" : "/aai/v11/search",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-search_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-search-deprecated",
+ "version" : "v11",
+ "url" : "/aai/v11/search",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/aai/v11/search",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-search-deprecated_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-service-design-and-creation",
+ "version" : "v11",
+ "url" : "/aai/v11/service-design-and-creation",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-service-design-and-creation_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "aai-service-design-and-creation-deprecated",
+ "version" : "v11",
+ "url" : "/aai/v11/service-design-and-creation",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/aai/v11/service-design-and-creation",
+ "enable_ssl" : true,
+ "nodes" : [ {
+ "ip" : "10.0.1.1",
+ "port" : "8443",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_aai-service-design-and-creation-deprecated_10.0.1.1_8443",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "activiti",
+ "version" : "v1",
+ "url" : "/api/activiti/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "8804",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_activiti_10.0.14.1_8804",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "activiti-rest",
+ "version" : "v1",
+ "url" : "/activiti-rest",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/activiti-rest",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "8804",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_activiti-rest_10.0.14.1_8804",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "catalog",
+ "version" : "v1",
+ "url" : "/api/catalog/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "172.17.0.15",
+ "port" : "8806",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_catalog_172.17.0.15_8806",
+ "status" : "passing"
+ }, {
+ "ip" : "10.0.14.1",
+ "port" : "8806",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_catalog_10.0.14.1_8806",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "emsdriver",
+ "version" : "v1",
+ "url" : "/api/emsdriver/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "8206",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_emsdriver_10.0.14.1_8206",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "gvnfmdriver",
+ "version" : "v1",
+ "url" : "/api/gvnfmdriver/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "172.17.0.17",
+ "port" : "8484",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_gvnfmdriver_172.17.0.17_8484",
+ "status" : "passing"
+ }, {
+ "ip" : "10.0.14.1",
+ "port" : "8484",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_gvnfmdriver_10.0.14.1_8484",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "huaweivnfmdriver",
+ "version" : "v1",
+ "url" : "/api/huaweivnfmdriver/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "8482",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_huaweivnfmdriver_10.0.14.1_8482",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "jujuvnfmdriver",
+ "version" : "v1",
+ "url" : "/api/jujuvnfmdriver/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "8483",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_jujuvnfmdriver_10.0.14.1_8483",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "multicloud",
+ "version" : "v0",
+ "url" : "/api/multicloud/v0",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "9001",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_multicloud_10.0.14.1_9001",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "multicloud-ocata",
+ "version" : "v0",
+ "url" : "/api/multicloud-ocata/v0",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "9006",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_multicloud-ocata_10.0.14.1_9006",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "multicloud-titanium_cloud",
+ "version" : "v0",
+ "url" : "/api/multicloud-titanium_cloud/v0",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "9005",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_multicloud-titanium_cloud_10.0.14.1_9005",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "multicloud-vio",
+ "version" : "v0",
+ "url" : "/api/multicloud-vio/v0",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "9004",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_multicloud-vio_10.0.14.1_9004",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "nokia-vnfm-driver",
+ "version" : "v1",
+ "url" : "/api/nokiavnfmdriver/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "172.17.0.27",
+ "port" : "8486",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_nokia-vnfm-driver_172.17.0.27_8486",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "nokiavnfmdriver",
+ "version" : "v1",
+ "url" : "/api/nokiavnfmdriver/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "8485",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_nokiavnfmdriver_10.0.14.1_8485",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "nslcm",
+ "version" : "v1",
+ "url" : "/api/nslcm/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "172.17.0.20",
+ "port" : "8403",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_nslcm_172.17.0.20_8403",
+ "status" : "passing"
+ }, {
+ "ip" : "10.0.14.1",
+ "port" : "8403",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_nslcm_10.0.14.1_8403",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "policy-pdp",
+ "version" : "v1",
+ "url" : "/pdp",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.6.1",
+ "port" : "8081",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_policy-pdp_10.0.6.1_8081",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "policy-pdp-deprecated",
+ "version" : "v1",
+ "url" : "/pdp",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/pdp",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.6.1",
+ "port" : "8081",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_policy-pdp-deprecated_10.0.6.1_8081",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "portal",
+ "version" : "v2",
+ "url" : "/",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.9.1",
+ "port" : "8989",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_portal_10.0.9.1_8989",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "resmgr",
+ "version" : "v1",
+ "url" : "/api/resmgr/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "8480",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_resmgr_10.0.14.1_8480",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "sdc",
+ "version" : "v1",
+ "url" : "/sdc/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.3.1",
+ "port" : "8080",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_sdc_10.0.3.1_8080",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "sdc-deprecated",
+ "version" : "v1",
+ "url" : "/sdc/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/sdc/v1",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.3.1",
+ "port" : "8080",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_sdc-deprecated_10.0.3.1_8080",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "sdnc",
+ "version" : "v1",
+ "url" : "/restconf",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/restconf",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.7.1",
+ "port" : "8282",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_sdnc_10.0.7.1_8282",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "so",
+ "version" : "v1",
+ "url" : "/ecomp/mso/infra",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.5.1",
+ "port" : "8080",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_so_10.0.5.1_8080",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "so-deprecated",
+ "version" : "v1",
+ "url" : "/ecomp/mso/infra",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/ecomp/mso/infra",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.5.1",
+ "port" : "8080",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_so-deprecated_10.0.5.1_8080",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "usecase-ui",
+ "version" : "v1",
+ "url" : "/usecase-ui",
+ "protocol" : "UI",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "172.17.0.11",
+ "port" : "8080",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_usecase-ui_172.17.0.11_8080",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "usecaseui",
+ "version" : "v1",
+ "url" : "/api/usecaseui/server/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "8901",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_usecaseui_10.0.14.1_8901",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "usecaseui-gui",
+ "version" : "v1",
+ "url" : "/iui/usecaseui",
+ "protocol" : "UI",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/iui/usecaseui",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "8900",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_usecaseui-gui_10.0.14.1_8900",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "vnflcm",
+ "version" : "v1",
+ "url" : "/api/vnflcm/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "8801",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_vnflcm_10.0.14.1_8801",
+ "status" : "passing"
+ }, {
+ "ip" : "172.17.0.22",
+ "port" : "8801",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_vnflcm_172.17.0.22_8801",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "vnfmgr",
+ "version" : "v1",
+ "url" : "/api/vnfmgr/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "172.17.0.23",
+ "port" : "8803",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_vnfmgr_172.17.0.23_8803",
+ "status" : "passing"
+ }, {
+ "ip" : "10.0.14.1",
+ "port" : "8803",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_vnfmgr_10.0.14.1_8803",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "vnfres",
+ "version" : "v1",
+ "url" : "/api/vnfres/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "172.17.0.24",
+ "port" : "8802",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_vnfres_172.17.0.24_8802",
+ "status" : "passing"
+ }, {
+ "ip" : "10.0.14.1",
+ "port" : "8802",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_vnfres_10.0.14.1_8802",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "workflow",
+ "version" : "v1",
+ "url" : "/api/workflow/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "8805",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_workflow_10.0.14.1_8805",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "ztesdncdriver",
+ "version" : "v1",
+ "url" : "/api/ztesdncdriver/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "172.17.0.25",
+ "port" : "8411",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_ztesdncdriver_172.17.0.25_8411",
+ "status" : "passing"
+ }, {
+ "ip" : "10.0.14.1",
+ "port" : "8411",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_ztesdncdriver_10.0.14.1_8411",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }, {
+ "serviceName" : "ztevmanagerdriver",
+ "version" : "v1",
+ "url" : "/api/ztevmanagerdriver/v1",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.14.1",
+ "port" : "8410",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_ztevmanagerdriver_10.0.14.1_8410",
+ "status" : "passing"
+ }, {
+ "ip" : "172.17.0.26",
+ "port" : "8410",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_ztevmanagerdriver_172.17.0.26_8410",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ } ]
+ }
} ] \ No newline at end of file
diff --git a/plugins/msb/src/test/resources/onap-cli-sample/microservice-list-schema-sample.yaml b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-sample.yaml
index 32ccd377..7e104049 100644
--- a/plugins/msb/src/test/resources/onap-cli-sample/microservice-list-schema-sample.yaml
+++ b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: microservice-list
version: onap-1.1
samples:
diff --git a/plugins/msb/src/test/resources/onap-cli-sample/microservice-show-schema-moco.json b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-moco.json
index 7d0863f7..5064b7b6 100644
--- a/plugins/msb/src/test/resources/onap-cli-sample/microservice-show-schema-moco.json
+++ b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-moco.json
@@ -1,41 +1,41 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/api/microservices/v1/services/test/version/v1",
- "headers" : {
- "Accept" : "application/json",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "serviceName" : "test",
- "version" : "v1",
- "url" : "/C:/Git/test",
- "protocol" : "REST",
- "visualRange" : "1",
- "lb_policy" : "ip_hash",
- "publish_port" : "",
- "namespace" : "",
- "network_plane_type" : "",
- "host" : "",
- "path" : "/C:/Git/test",
- "enable_ssl" : false,
- "nodes" : [ {
- "ip" : "10.0.0.1",
- "port" : "8080",
- "checkType" : "",
- "checkUrl" : "",
- "ha_role" : "",
- "nodeId" : "_test_10.0.0.1_8080",
- "status" : "passing"
- } ],
- "metadata" : [ ],
- "labels" : [ ],
- "status" : "1",
- "is_manual" : false
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/api/microservices/v1/services/test/version/v1",
+ "headers" : {
+ "Accept" : "application/json",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "serviceName" : "test",
+ "version" : "v1",
+ "url" : "/C:/Git/test",
+ "protocol" : "REST",
+ "visualRange" : "1",
+ "lb_policy" : "ip_hash",
+ "publish_port" : "",
+ "namespace" : "",
+ "network_plane_type" : "",
+ "host" : "",
+ "path" : "/C:/Git/test",
+ "enable_ssl" : false,
+ "nodes" : [ {
+ "ip" : "10.0.0.1",
+ "port" : "8080",
+ "checkType" : "",
+ "checkUrl" : "",
+ "ha_role" : "",
+ "nodeId" : "_test_10.0.0.1_8080",
+ "status" : "passing"
+ } ],
+ "metadata" : [ ],
+ "labels" : [ ],
+ "status" : "1",
+ "is_manual" : false
+ }
+ }
} ] \ No newline at end of file
diff --git a/plugins/msb/src/test/resources/onap-cli-sample/microservice-show-schema-sample.yaml b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-sample.yaml
index 602e39a8..86f1f417 100644
--- a/plugins/msb/src/test/resources/onap-cli-sample/microservice-show-schema-sample.yaml
+++ b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: microservice-show
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-create-service-sample-1.1.yaml b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-create-service-sample-1.1.yaml
deleted file mode 100644
index d316f388..00000000
--- a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-create-service-sample-1.1.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: microservice-create
-version: onap-1.1
-samples:
- sample1:
- name: Create a service
- input: --service-name test-service --service-version v1 --service-url /api/test/v1 --host-url http://192.168.17.23:80 23.14.15.156 80
- output: |
- +----------+------------------------------------+
- |property |value |
- +----------+------------------------------------+
- |name |test-service |
- +----------+------------------------------------+
- |version |v1 |
- +----------+------------------------------------+
- |url |/api/test/v1 |
- +----------+------------------------------------+
- |status |1 |
- +----------+------------------------------------+ \ No newline at end of file
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-delete-service-sample-1.1.yaml b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-delete-service-sample-1.1.yaml
deleted file mode 100644
index 2aaadb22..00000000
--- a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-delete-service-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: microservice-delete
-version: onap-1.1
-samples:
- sample1:
- name: Delete a service
- input: --service-name test-service --service-version v1 --host-url http://192.168.17.23:80 --node-ip 23.14.15.156 --node-port 80 \ No newline at end of file
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-list-service-sample-1.1.yaml b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-list-service-sample-1.1.yaml
deleted file mode 100644
index 178a9c85..00000000
--- a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-list-service-sample-1.1.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: microservice-list
-version: onap-1.1
-samples:
- sample1:
- name: List a service
- input: --host-url http://192.168.17.23:80
- output: |
- +--------------+----------+------------------------------------+--------+------------------+
- |name |version |url |status |nodes |
- +--------------+----------+------------------------------------+--------+------------------+
- |test-service |v1 |/C:/Program Files/Git/api/test/v1 |1 |23.14.15.156:80 |
- +--------------+----------+------------------------------------+--------+------------------+ \ No newline at end of file
diff --git a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-show-service-sample-1.1.yaml b/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-show-service-sample-1.1.yaml
deleted file mode 100644
index abf1f110..00000000
--- a/plugins/onap-1.1/features/msb/src/test/resources/open-cli-sample/msb-show-service-sample-1.1.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: microservice-show
-version: onap-1.1
-samples:
- sample1:
- name: Show a service
- input: --service-name test-service --service-version v1 --host-url http://192.168.17.23:80
- output: |
- +--------------+----------+------------------------------------+--------+------------------+
- |name |version |url |status |nodes |
- +--------------+----------+------------------------------------+--------+------------------+
- |test-service |v1 |/C:/Program Files/Git/api/test/v1 |1 |23.14.15.156:80 |
- +--------------+----------+------------------------------------+--------+------------------+ \ No newline at end of file
diff --git a/plugins/onap-1.1/features/pom.xml b/plugins/onap-1.1/features/pom.xml
index ded980d6..ca51aaae 100644
--- a/plugins/onap-1.1/features/pom.xml
+++ b/plugins/onap-1.1/features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins-onap-1.1</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.1-features</artifactId>
diff --git a/plugins/onap-1.1/features/sdc/pom.xml b/plugins/onap-1.1/features/sdc/pom.xml
index abd24800..71ef047e 100644
--- a/plugins/onap-1.1/features/sdc/pom.xml
+++ b/plugins/onap-1.1/features/sdc/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins-onap-1.1-features</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.1-features-sdc</artifactId>
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-add-vf-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-1.1.yaml
index 7179b460..33dce3cd 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-add-vf-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: service-model-add-vf
description: Helps to add VF into service models in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: service-model-id
@@ -42,6 +42,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/services/${service-model-id}/resourceInstance
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-approve-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-1.1.yaml
index 59b39864..1e779b3a 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-approve-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: service-model-approve
description: Approves the Service model in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: service-model-id
@@ -17,6 +17,11 @@ parameters:
is_optional: true
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/services/${service-model-id}/distribution-state/approve
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-complete-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-complete-schema-1.1.yaml
index 3402d673..e45552b2 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-complete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-complete-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: service-model-certify-complete
description: Completes the certification of Service model in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: service-model-id
@@ -17,6 +17,11 @@ parameters:
is_optional: true
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/certify
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-request-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-request-schema-1.1.yaml
index 2c437e51..e9787c5f 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-request-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-request-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: service-model-certify-request
description: Request the certification of Service model in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: service-model-id
@@ -17,6 +17,11 @@ parameters:
is_optional: true
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/certificationRequest
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-start-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-start-schema-1.1.yaml
index 05c056d1..9c6dfad3 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-start-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-certify-start-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: service-model-certify-start
description: Starts the certification of Service model in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: service-model-id
@@ -17,6 +17,11 @@ parameters:
is_optional: true
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/startCertification
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-checkin-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-1.1.yaml
index d5900fec..9e03dfe1 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-checkin-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: service-model-checkin
description: Checkin Service model in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: service-model-id
@@ -17,6 +16,11 @@ parameters:
is_optional: true
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/checkin
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-checkout-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-1.1.yaml
index 26c31ac4..da392975 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-checkout-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: service-model-revert
description: Checkout Service model in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: service-model-id
@@ -17,6 +17,11 @@ parameters:
is_optional: true
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/checkout
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-create-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-1.1.yaml
index 17811ee4..d723d2bd 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: service-model-create
description: Create Service model in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: name
@@ -57,6 +57,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/services
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-distribute-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-1.1.yaml
index f88925d4..76428a15 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-distribute-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: service-model-distribute
description: Distributes the Service model in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: service-model-id
@@ -17,6 +17,11 @@ parameters:
is_optional: true
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/services/${service-model-id}/distribution/PROD/activate
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-list-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-1.1.yaml
index 315f800f..fdc2529c 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: service-model-list
description: List the service model in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
results:
direction: landscape
@@ -41,6 +41,11 @@ results:
scope: long
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/followed
method: GET
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-revert-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-revert-schema-1.1.yaml
index fe78241e..7d91015f 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-revert-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-revert-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: service-model-checkout
description: Checkout Service model in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: service-model-id
@@ -17,6 +17,11 @@ parameters:
is_optional: true
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/UNDOCHECKOUT
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service2vf-model-list-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-1.1.yaml
index 26d7cd62..b0b7790a 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service2vf-model-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: service2vf-model-list
description: List the VF in a given service model in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: service-model-id
@@ -37,6 +37,11 @@ results:
scope: short
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/services/${service-model-id}
method: GET
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-certify-complete-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-complete-schema-1.1.yaml
index 4baca00c..5a9d900b 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-certify-complete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-complete-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vf-model-certify-complete
description: Complete certifying Virtual function
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vf-id
@@ -17,6 +17,11 @@ parameters:
is_optional: true
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/resources/${vf-id}/lifecycleState/certify
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-certify-request-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-request-schema-1.1.yaml
index 301449ce..62c749a7 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-certify-request-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-request-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vf-model-certify-request
description: Request for certifying Virtual function
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vf-id
@@ -17,6 +17,11 @@ parameters:
is_optional: true
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/resources/${vf-id}/lifecycleState/certificationRequest
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-certify-start-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-start-schema-1.1.yaml
index f37a1af0..ed8cbb92 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-certify-start-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-start-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vf-model-certify-start
description: Start certifying Virtual function
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vf-id
@@ -17,6 +17,11 @@ parameters:
is_optional: true
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/resources/${vf-id}/lifecycleState/startCertification
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-checkin-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkin-schema-1.1.yaml
index 4ee74e12..235ff834 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-checkin-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkin-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vf-model-checkin
description: Checkin Virtual function
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vf-id
@@ -17,6 +17,11 @@ parameters:
is_optional: true
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/resources/${vf-id}/lifecycleState/checkin
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-create-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-1.1.yaml
index fb3635fa..614a5098 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vf-model-create
description: Create Virtual function from Vendor Software Product
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: name
@@ -47,6 +47,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/resources
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-list-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-list-schema-1.1.yaml
index 50a568a8..172ad815 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf-model-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-list-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vf-model-list
description: List the VF resource model in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
results:
direction: landscape
@@ -48,6 +48,11 @@ results:
type: string
scope: long
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/followed
method: GET
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml
index a138363f..75092245 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vf/vf2vfmodule-model-list-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vf2vfmodule-model-list
description: List the VF modules in a given VF model in SDC
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vf-id
@@ -45,6 +45,11 @@ results:
scope: short
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /sdc2/rest/v1/catalog/resources/${vf-id}
method: GET
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-entitlement-pool-create-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-create-schema.yaml
index db0af2b6..7d944f53 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-entitlement-pool-create-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-create-schema.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: ep-create
description: Create Entitlement Pool
-version: onap-1.0
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: ep-name
@@ -73,6 +73,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${license-model-id}/entitlement-pools
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-entitlement-pool-show-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-show-schema.yaml
index 93968407..e3b9578d 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-entitlement-pool-show-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-entitlement-pool-show-schema.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: ep-show
description: Details of the Entitlement Pool
-version: onap-1.0
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: license-model-id
@@ -38,6 +38,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${license-model-id}/entitlement-pools/${pool-id}
method: GET
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-group-create-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-create-schema.yaml
index bd9b8a23..3bf9c84b 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-group-create-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-create-schema.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: license-group-create
description: Create License Group
-version: onap-1.0
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: group-name
@@ -36,6 +36,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${license-model-id}/license-key-groups
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-group-show-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-show-schema.yaml
index 3b93d9e2..231387ef 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-group-show-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-group-show-schema.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: license-group-show
description: Details of the License Group
-version: onap-1.0
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: license-model-id
@@ -38,6 +38,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${license-model-id}/license-key-groups/${license-group-id}
method: GET
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-create-schema.yaml
index d107846d..7493ee26 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-create-schema.yaml
@@ -7,6 +7,7 @@ info:
service: sdc
author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vendor-name
description: vendor name
@@ -29,7 +30,9 @@ results:
type: string
http:
service:
- auth: none
+ name: sdc
+ version: v1.0
+ auth: basic
mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-show-schema.yaml
index 4d1d8a9d..05ceace0 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/license-model-show-schema.yaml
@@ -7,6 +7,7 @@ info:
service: sdc
author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: license-model-id
description: Onap License Model ID
@@ -36,10 +37,12 @@ results:
type: string
http:
service:
- auth: none
+ name: sdc
+ version: v1.0
+ auth: basic
mode: direct
request:
- uri: /onboarding-api/v1.0/vendor-software-products/${license-model-id}
+ uri: /onboarding-api/v1.0/vendor-license-models/${license-model-id}
method: GET
success_codes:
- 200
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-aggreement-create-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-1.1.yaml
index 47540eed..2224d6d5 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-aggreement-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vlm-aggreement-create
description: Create license aggreement
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: name
@@ -48,6 +47,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/license-agreements
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-aggreement-list-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-list-schema-1.1.yaml
index 3ca3dea7..9a7f6c79 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-aggreement-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-list-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vlm-aggreement-list
description: List license aggreement
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: vlm-id
@@ -34,6 +33,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/license-agreements
method: GET
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-checkin-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkin-schema-1.1.yaml
index 77822554..b05fbb16 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-checkin-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkin-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vlm-checkin
description: Checkin Vendor License Model
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vlm-id
@@ -22,6 +22,11 @@ parameters:
long_option: vlm-version
is_optional: false
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/actions
method: PUT
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-checkout-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkout-schema-1.1.yaml
index 82108a60..6b4c5688 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-checkout-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-checkout-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vlm-checkout
description: Checkout Vendor License Model
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vlm-id
@@ -22,6 +22,11 @@ parameters:
long_option: vlm-version
is_optional: false
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/actions
method: PUT
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-create-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-create-schema-1.1.yaml
index 6fe6f575..128a9e2c 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-create-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vlm-create
description: Create License Model
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vendor-name
@@ -29,6 +29,11 @@ results:
scope: short
type: uuid
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-entitlement-pool-create-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-create-schema-1.1.yaml
index 14f2ad53..db59fc24 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-entitlement-pool-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-create-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vlm-entitlement-pool-create
description: Create Entitlement Pool
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: name
@@ -56,6 +56,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/entitlement-pools
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-entitlement-pool-list-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-list-schema-1.1.yaml
index a2dc51d7..0e6dc66b 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-entitlement-pool-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-list-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vlm-entitlement-pool-list
description: entitlement pool list in a license model
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vlm-id
@@ -34,6 +34,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/entitlement-pools
method: GET
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-feature-group-create-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-create-schema-1.1.yaml
index bd022363..a694ae62 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-feature-group-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-create-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vlm-feature-group-create
description: Create feature group Pool
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: name
@@ -67,6 +67,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/feature-groups
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-feature-group-list-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-list-schema-1.1.yaml
index 24833d04..3f3a1aff 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-feature-group-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-list-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vlm-feature-group-list
description: Feature group list in a license model
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vlm-id
@@ -34,6 +34,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/feature-groups
method: GET
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-key-group-create-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-create-schema-1.1.yaml
index 27cb60d8..69ba00ec 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-key-group-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-create-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vlm-key-group-create
description: Create License Key Group
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vlm-id
@@ -49,6 +49,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/license-key-groups
method: POST
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-key-group-list-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-list-schema-1.1.yaml
index 5797ddeb..e326f2e6 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-key-group-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-list-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vlm-key-group-list
description: key group list in a license model
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vlm-id
@@ -34,6 +34,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/license-key-groups
method: GET
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-list-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-list-schema-1.1.yaml
index e8944955..c85846f7 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-list-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vlm-list
description: List License Model
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
results:
direction: landscape
@@ -32,6 +32,11 @@ results:
scope: long
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models
method: GET
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-revert-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-revert-schema-1.1.yaml
index c1e15cff..890da577 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-revert-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-revert-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vlm-revert
description: Revert Vendor License Model
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vlm-id
@@ -22,6 +22,11 @@ parameters:
long_option: vlm-version
is_optional: false
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/actions
method: PUT
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-submit-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-submit-schema-1.1.yaml
index 8e5f026e..f824af07 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/vlm-submit-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-submit-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vlm-submit
description: Submit Vendor License Model
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: vlm-id
@@ -22,6 +22,11 @@ parameters:
long_option: vlm-version
is_optional: false
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/actions
method: PUT
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml
index fec5938d..6822ef90 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vsp-add-artifact
description: Upload the CSAR file to VSP
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: vsp-id
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema-1.1.yaml
index 569dd3d7..cdafa2c7 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vsp-checkin
description: Checkin Vendor Software Product
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: vsp-id
@@ -22,6 +21,11 @@ parameters:
long_option: vsp-version
is_optional: false
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/actions
method: PUT
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
deleted file mode 100644
index acb6a076..00000000
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-checkin
-description: Checkin Vendor Software Product
-
-info:
- product: onap-1.1
- service: sdc
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: vsp-id
- description: Onap VSP ID
- type: string
- short_option: x
- long_option: vsp-id
- is_optional: false
-http:
- service:
- auth: none
- mode: direct
- request:
- uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
- method: PUT
- body: '{"action": "Checkin"}'
- success_codes:
- - 201
- - 200
- sample_response:
- body: ''
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkout-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema-1.1.yaml
index 82dc5c40..9e221b7f 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkout-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema-1.1.yaml
@@ -1,13 +1,11 @@
open_cli_schema_version: 1.0
name: vsp-checkout
description: Checkout Vendor Software Product
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: vsp-id
@@ -23,6 +21,11 @@ parameters:
long_option: vsp-version
is_optional: false
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/actions
method: PUT
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
deleted file mode 100644
index 033b9374..00000000
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-checkout
-description: Checkout Vendor Software Product
-
-info:
- product: onap-1.1
- service: sdc
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: vsp-id
- description: Onap VSP ID
- type: string
- short_option: x
- long_option: vsp-id
- is_optional: false
-http:
- service:
- auth: none
- mode: direct
- service:
- auth: none
- mode: direct
- request:
- uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
- method: PUT
- body: '{"action": "Checkout"}'
- success_codes:
- - 201
- - 200
- sample_response:
- body: ''
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-1.1.yaml
index 44e4651d..e4cd8bd3 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vsp-create
description: Create Vendor Software Product
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: vsp-name
@@ -74,6 +73,11 @@ results:
scope: short
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-software-products
method: POST
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
deleted file mode 100644
index 690ecabf..00000000
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-create
-description: Create Vendor Software Product
-
-info:
- product: onap-1.1
- service: sdc
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: vsp-name
- description: Onap VSP Name
- type: string
- short_option: x
- long_option: vsp-name
- is_optional: false
- - name: vsp-description
- description: Description for VSP
- type: string
- short_option: y
- long_option: vsp-description
- is_optional: true
- - name: vsp-category
- description: Category of the VSP
- type: string
- long_option: vsp-category
- is_optional: true
- default_value: resourceNewCategory.generic
- - name: vsp-subcategory
- description: Sub Category of VSP
- type: string
- long_option: vsp-subcategory
- is_optional: true
- default_value: resourceNewCategory.generic.abstract
- - name: vsp-license-version
- description: License version
- type: string
- long_option: vsp-license-version
- is_optional: true
- default_value: 1.0
- - name: vsp-vendor-name
- description: License Model Name
- type: string
- long_option: vsp-vendor-name
- is_optional: false
- - name: vsp-vendor-id
- description: License Model ID
- type: string
- long_option: vsp-vendor-id
- is_optional: false
- - name: license-agreement-id
- description: License Agreement ID
- type: string
- long_option: license-agreement-id
- is_optional: false
- - name: feature-group-id
- description: Feature Group ID
- type: string
- long_option: feature-group-id
- is_optional: false
-results:
- direction: portrait
- attributes:
- - name: ID
- description: VSP ID
- scope: short
- type: string
-http:
- service:
- auth: none
- mode: direct
- request:
- uri: /onboarding-api/v1.0/vendor-software-products
- method: POST
- body: '{"name": "${vsp-name}", "description": "${vsp-description}", "category": "${vsp-category}", "subCategory": "${vsp-subcategory}", "licensingVersion": "${vsp-license-version}", "vendorName": "${vsp-vendor-name}", "vendorId": "${vsp-vendor-id}", "icon": "icon", "licensingData": { "licenseAgreement": "${license-agreement-id}", "featureGroups": [ "${feature-group-id}" ]}}'
- success_codes:
- - 200
- result_map:
- ID: $b{$.vspId}
- sample_response:
- body: '{"vspId":"2DEB6CB4B082415BB7A697C9CD1273BA"}'
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-1.1.yaml
index a9aa8100..8271f9de 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vsp-list
description: List of the Vendor Software Products
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
results:
direction: landscape
@@ -40,6 +39,11 @@ results:
scope: long
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-software-products
method: GET
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
deleted file mode 100644
index 77fda362..00000000
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-list
-description: List of the Vendor Software Products
-
-info:
- product: onap-1.1
- service: sdc
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-results:
- direction: landscape
- attributes:
- - name: ID
- description: VSP ID
- scope: short
- type: string
- - name: name
- description: VSP Name
- scope: short
- type: string
-http:
- service:
- auth: none
- mode: direct
- request:
- uri: /onboarding-api/v1.0/vendor-software-products
- method: GET
- success_codes:
- - 200
- result_map:
- name: $b{results.[*].name}
- ID: $b{results.[*].id}
- sample_response:
- body: '{"results":[{"name":"test-vsp1","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"354BF3E32E494EAFBB15037CFAB262FF","version":"0.1","viewableVersions":["0.1"],"status":"Locked","lockingUser":"cs0008"},{"name":"test-vsp","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"2DEB6CB4B082415BB7A697C9CD1273BA","version":"1.0","viewableVersions":["1.0"],"finalVersions":["1.0"],"status":"Final"}],"listCount":2}'
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-package-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-1.1.yaml
index 9f37277b..01833844 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-package-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vsp-package
description: Package Vendor Software Product
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: vsp-id
@@ -22,6 +21,11 @@ parameters:
long_option: vsp-version
is_optional: false
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/actions
method: PUT
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-revert-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-revert-schema-1.1.yaml
index dad10aee..f5796520 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-revert-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-revert-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vsp-revert
description: Revert Vendor Software Product
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: vsp-id
@@ -22,6 +21,11 @@ parameters:
long_option: vsp-version
is_optional: false
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/actions
method: PUT
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema-1.1.yaml
index 785368cd..dea07300 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vsp-show
description: Details of the Vendor Software Product
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: vsp-id
@@ -57,6 +56,11 @@ results:
scope: long
type: string
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}
method: GET
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
deleted file mode 100644
index 9310275d..00000000
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-show
-description: Details of the Vendor Software Product
-
-info:
- product: onap-1.1
- service: sdc
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: vsp-id
- description: Onap VSP ID
- type: string
- short_option: x
- long_option: vsp-id
- is_optional: false
-
-results:
- direction: landscape
- attributes:
- - name: name
- description: VSP Name
- scope: short
- type: string
- - name: ID
- description: VSP ID
- scope: short
- type: string
- - name: description
- description: Description for the VSP
- scope: short
- type: string
-http:
- service:
- auth: none
- mode: direct
- request:
- uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}
- method: GET
- success_codes:
- - 200
- result_map:
- name: $b{$.name}
- ID: $b{$.id}
- description: $b{$.description}
- sample_response:
- body: '{"name":"test-vsp1","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"354BF3E32E494EAFBB15037CFAB262FF","version":"0.1","viewableVersions":["0.1"],"status":"Locked","lockingUser":"cs0008"}'
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema-1.1.yaml
index ec33538c..6529b9a3 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vsp-submit
description: Submit Vendor Software Product
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: vsp-id
@@ -22,6 +21,11 @@ parameters:
long_option: vsp-version
is_optional: false
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/actions
method: PUT
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
deleted file mode 100644
index 029fd123..00000000
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-submit
-description: Submit Vendor Software Product
-
-info:
- product: onap-1.1
- service: sdc
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: vsp-id
- description: Onap VSP ID
- type: string
- short_option: x
- long_option: vsp-id
- is_optional: false
-http:
- service:
- auth: none
- mode: directs
- request:
- uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
- method: PUT
- body: '{"action": "Submit"}'
- success_codes:
- - 201
- - 200
- sample_response:
- body: ''
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
deleted file mode 100644
index fda1144f..00000000
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-upload
-description: Upload the CSAR file to VSP
-
-info:
- product: onap-1.1
- service: sdc
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: vsp-id
- description: Onap VSP ID
- type: string
- short_option: x
- long_option: vsp-id
- is_optional: false
- - name: vsp-file
- description: CSAR File path
- type: binary
- short_option: y
- long_option: vsp-file
- is_optional: false
-http:
- service:
- auth: none
- mode: direct
- request:
- uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/upload
- method: POST
- body: ${vsp-file}
- multipart_entity_name: upload
- success_codes:
- - 200
- sample_response:
- body: ''
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-validate-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-1.1.yaml
index 243ddbb4..42364cc3 100644
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-validate-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vsp-validate
description: Validated the uploaded Vendor Software Product
-version: onap-1.1
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: sdc
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: vsp-id
@@ -35,6 +34,11 @@ results:
type: json
http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
request:
uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/orchestration-template-candidate/process
method: PUT
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-add-vf-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-moco.json
index 34058a31..34058a31 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-add-vf-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-add-vf-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-sample.yaml
index b6a00f2f..2fd3d4d4 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-add-vf-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-add-vf-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-model-add-vf
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-complete-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-moco.json
index b7ea4ebf..b7ea4ebf 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-complete-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-complete-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-sample.yaml
index b6d51b4c..fb0d48d7 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-complete-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-complete-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-model-certify-complete
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-request-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-moco.json
index 0ae0e2da..0ae0e2da 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-request-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-request-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-sample.yaml
index 72c96594..a96f759a 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-request-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-request-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-model-certify-request
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-start-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-moco.json
index 1f1330d6..1f1330d6 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-start-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-start-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-sample.yaml
index 60af5e76..615f0247 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-certify-start-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-certify-start-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-model-certify-start
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-checkin-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-moco.json
index b6979a55..b6979a55 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-checkin-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-checkin-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-sample.yaml
index fa9847fe..acc1ab74 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-checkin-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-checkin-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-model-checkin
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-create-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-moco.json
index 5521a446..5521a446 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-sample.yaml
index 24f0ce52..7930e1f7 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-model-create
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-distribute-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-moco.json
index 9baedf85..9baedf85 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-distribute-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-distribute-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-sample.yaml
index 063ced97..162b2f93 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-distribute-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-distribute-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-model-distribute
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-moco.json
index d5745217..d5745217 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml
index ee9d02fb..40eec42e 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service-model-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-model-list
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service2vf-model-list-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-moco.json
index cb4b6e16..cb4b6e16 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service2vf-model-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml
index df500c86..b6442e8d 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/service-model/service2vf-model-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service2vf-model-list
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-complete-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-moco.json
index 48df97c4..48df97c4 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-complete-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-complete-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-sample.yaml
index e09db0a5..dab22073 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-complete-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-complete-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vf-model-certify-complete
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-request-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-moco.json
index 5160e68f..5160e68f 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-request-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-request-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-sample.yaml
index 58c86ef8..64a26472 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-request-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-request-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vf-model-certify-request
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-start-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-moco.json
index e5332cb8..e5332cb8 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-start-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-start-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-sample.yaml
index 9c89aaee..cbff5293 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-certify-start-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-certify-start-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vf-model-certify-start
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-checkin-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-moco.json
index 5fd14717..5fd14717 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-checkin-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-checkin-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-sample.yaml
index 1cc16c51..b88fa121 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-checkin-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-checkin-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vf-model-checkin
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-create-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-moco.json
index c71e0448..c71e0448 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-sample.yaml
index 29ca0bf9..bf043a0c 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vf-model-create
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-moco.json
index 0a7e338e..0a7e338e 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml
index 8b6b0443..f4b45889 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf-model-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vf-model-list
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json
index 14d15d02..14d15d02 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml
index 7a828a46..6fb4b0e9 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vf/vf2vfmodule-model-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vf2vfmodule-model-list
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-entitlement-pool-create-schema.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-create-schema.yaml
index 2b1d78d9..0ca30d3e 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-entitlement-pool-create-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-create-schema.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: ep-create
version: onap-1.0
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-entitlement-pool-show-schema.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-show-schema.yaml
index 244c1d66..4bed00ee 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-entitlement-pool-show-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-entitlement-pool-show-schema.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: ep-show
version: onap-1.0
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-group-create-schema.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-create-schema.yaml
index 21ab46d2..b5c2de44 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-group-create-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-create-schema.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: license-key-group-create
version: onap-1.0
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-group-show-schema.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-show-schema.yaml
index b927cd97..7dd75aca 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-group-show-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-group-show-schema.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: license-group-show
version: onap-1.0
@@ -12,4 +12,4 @@ samples:
|name |ID |description |
+----------------+----------------------------------+--------------+
|demo-key-group |3F57DDC6AF55420680D499CDAC047253 | |
- +----------------+----------------------------------+--------------+
+ +----------------+----------------------------------+--------------+
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-model-create-schema.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-create-schema.yaml
index 10fc0510..fdc54dd6 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-model-create-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-create-schema.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: license-model-create
version: onap-1.0
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-model-show-schema.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-show-schema.yaml
index 18e4c297..b8265664 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-model-show-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/license-model-show-schema.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: license-model-show
version: onap-1.0
@@ -12,4 +12,4 @@ samples:
|name |ID |description |status |
+----------+----------------------------------+----------------------+--------+
|5aa8a88c |4904E77EC4EF4CB18083E8ED7D283585 |vendor license model |Locked |
- +----------+----------------------------------+----------------------+--------+
+ +----------+----------------------------------+----------------------+--------+
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-create-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-moco.json
index 44038797..44038797 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml
index 2acd3d84..4817206a 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-aggreement-create
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-list-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-moco.json
index 3da67ac8..3da67ac8 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-sample.yaml
index 976ba65e..01e9b906 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-aggreement-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-aggreement-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-aggreement-list
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json
index c62f721c..c62f721c 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml
index b74d54b5..2db17cb9 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkin-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-checkin
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkout-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-moco.json
index 164a59c7..164a59c7 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkout-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkout-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-sample.yaml
index e17cf398..1e647559 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-checkout-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-checkout-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-checkout
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-moco.json
index 57445daf..57445daf 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml
index 1897b099..899ca07e 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-create
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-moco.json
index f40193ad..f40193ad 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-sample.yaml
index 7135810e..b4505a3c 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-entitlement-pool-create
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-moco.json
index acf1f022..acf1f022 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-sample.yaml
index 25457ef4..0f45164c 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-entitlement-pool-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-entitlement-pool-list
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-create-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-moco.json
index d3b8c0d2..d3b8c0d2 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml
index 645683ed..13e393b5 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-feature-group-create
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-list-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-moco.json
index ac09b4eb..ac09b4eb 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-sample.yaml
index 1df75991..4745329b 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-feature-group-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-feature-group-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-feature-group-list
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-create-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-moco.json
index 4ac759e9..4ac759e9 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml
index b76ea390..a140156c 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-key-group-create
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-list-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-moco.json
index cb688bbc..cb688bbc 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-sample.yaml
index d2131fc7..b088bb72 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-key-group-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-key-group-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-key-group-list
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-moco.json
index 8634d109..8634d109 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml
index c3c3bfee..9f4abce7 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-list
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-revert-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-moco.json
index 692cf4e1..5045c98c 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-revert-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-moco.json
@@ -1,21 +1,21 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/onboarding-api/v1.0/vendor-license-models/cf2d907d998e44698ce3b4cded5f66a7/versions/0.1/actions",
- "headers" : {
- "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "USER_ID" : "cs0008",
- "X-TransactionId" : "req-16ce9480-a0dc-4628-b49a-bc0f8aca4286",
- "Content-Type" : "application/json"
- },
- "json" : {
- "action" : "Undo_Checkout"
- }
- },
- "response" : {
- "status" : 200,
- "json" : { }
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/onboarding-api/v1.0/vendor-license-models/cf2d907d998e44698ce3b4cded5f66a7/versions/0.1/actions",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-16ce9480-a0dc-4628-b49a-bc0f8aca4286",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "action" : "Undo_Checkout"
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : { }
+ }
} ] \ No newline at end of file
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-revert-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-sample.yaml
index f1b084dd..c9ac298f 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-revert-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-revert-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-revert
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-moco.json
index b7811539..b7811539 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml
index 231f692a..bbe93d68 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vlm/vlm-submit-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vlm-submit
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
deleted file mode 100644
index 6fb545ef..00000000
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vsp-checkin
-version: onap-1.1
-samples:
- sample1:
- name: Checkin the Vendor Software Product
- input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json
index bf29aed4..bf29aed4 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-sample.yaml
index 24257e0c..bd1a6f98 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-checkin
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
deleted file mode 100644
index d7a9e375..00000000
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vsp-checkout
-version: onap-1.1
-
-samples:
- sample1:
- name: Checkout the Vendor Software Product
- input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json
index fb90a444..fb90a444 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml
index 3fc90061..45e880d9 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-checkout
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
deleted file mode 100644
index fa5b0a61..00000000
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vsp-create
-version: onap-1.1
-samples:
- sample1:
- name: Create the Vendor Software Product
- input: --host-username cs0008 --host-password demo123456! --host-url http://locahost:8080 --vsp-name demo-vsp2 --vsp-vendor-name 5aa8a88c --vsp-vendor-id DBB202617952486691C1E35C9 621CD4E --license-agreement-id E19DBDDB137B494385F9535325BFD585 --feature-group-id 94835F096DAF4ED78781A394A4F22AD1
- output: |
- +----------+----------------------------------+
- |property |value |
- +----------+----------------------------------+
- |ID |6897DFFF8E864F84AD17A34B7FB936A3 |
- +----------+----------------------------------+
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-moco.json
index 0a9b516c..0a9b516c 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml
index 7b69ca1f..2ffe41b4 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-create
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
deleted file mode 100644
index aeab1694..00000000
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vsp-list
-version: onap-1.1
-samples:
- sample1:
- name: List Vendor Software Products
- input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080
- output: |
- +----------------------------------+------------+
- |ID |name |
- +----------------------------------+------------+
- |E563CB23A6BE49AF9A84CF579DAFB929 |demo-vsp2 |
- +----------------------------------+------------+
- |79E62AA736C34E359B869E757D3DDBBE |demo-vsp1 |
- +----------------------------------+------------+
- |928B828EE3CC46B99B92D7B9A2AB2118 |demo-vsp |
- +----------------------------------+------------+
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-moco.json
index b2f96dd9..b2f96dd9 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml
index 16f0810f..83df60da 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-list
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-moco.json
index 9c93fb79..9c93fb79 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml
index 21d99ff5..6eb13313 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-package-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-package
version: onap-1.1
samples:
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-revert-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-moco.json
index fcff4c97..fcff4c97 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-revert-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-revert-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-sample.yaml
index b9c705cc..274d54c7 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-revert-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-revert-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-revert
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
deleted file mode 100644
index fd2f132f..00000000
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vsp-show
-version: onap-1.1
-samples:
- sample1:
- name: Show the details of Vendor Software Products
- input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id 2DEB6CB4B082415BB7A697C9CD1273BA
- output: |
- +----------+----------------------------------+--------------------------+
- |name |ID |description |
- +----------+----------------------------------+--------------------------+
- |test-vsp |2DEB6CB4B082415BB7A697C9CD1273BA |vendor software product |
- +----------+----------------------------------+--------------------------+
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-moco.json
index 8caab9a1..8caab9a1 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml
index 8912d42d..5c15ec13 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-show
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
deleted file mode 100644
index 0a157c11..00000000
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vsp-submit
-version: onap-1.1
-samples:
- sample1:
- name: Submit the Vendor Software Product
- input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-moco.json
index 6ec6072b..6ec6072b 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml
index 5b874e34..74a4c66c 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-submit
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
deleted file mode 100644
index 5c5263fd..00000000
--- a/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vsp-upload
-version: onap-1.1
-samples:
- sample1:
- name: upload the zip file to Vendor Software Product
- input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929 --vsp-file /home/user/vFW.zip
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-schema-1.1-sample.yaml
index 5c2a1b95..dc229d76 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-upload
version: onap-1.1
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-moco.json b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-moco.json
index 8ae9d2c5..8ae9d2c5 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-moco.json
diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml
index 8d9e9aa8..341f38c7 100644
--- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-validate-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vsp-validate
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/so/pom.xml b/plugins/onap-1.1/features/so/pom.xml
index c801f18d..7f800a7f 100644
--- a/plugins/onap-1.1/features/so/pom.xml
+++ b/plugins/onap-1.1/features/so/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins-onap-1.1-features</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.1-features-so</artifactId>
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml
index 94f2e4a4..c9b1d7ac 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml
@@ -1,20 +1,11 @@
open_cli_schema_version: 1.0
name: service-create
description: Create a service instance using MSO
-<<<<<<< cf220435576757be81a477d68413c0dabc592478
-version: onap-1.1
-service:
- name: so
- version: v3
- auth: basic
- mode: direct
-=======
info:
product: onap-1.1
service: so
author: ONAP CLI Team onap-discuss@lists.onap.org
->>>>>>> Migrate plugins to use info section
parameters:
- name: cloud-region
@@ -89,7 +80,9 @@ results:
http:
service:
- auth: none
+ name: so
+ version: v3
+ auth: basic
mode: direct
request:
uri: /ecomp/mso/infra/serviceInstances/v3
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml
index 93f2a1ed..324e4e20 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml
@@ -1,25 +1,12 @@
open_cli_schema_version: 1.0
name: service-delete
-<<<<<<< a936ccab2b00d462f0b1f3e8318004f0414f07ef
+
description: Delete service instance (experimental)
-=======
-<<<<<<< cf220435576757be81a477d68413c0dabc592478
-description: Delete service instance
->>>>>>> Migrate plugins to use info section
-version: onap-1.1
-service:
- name: so
- version: v3
- auth: basic
- mode: direct
-=======
-description: Delete a service instance
info:
product: onap-1.1
service: so
author: ONAP CLI Team onap-discuss@lists.onap.org
->>>>>>> Migrate plugins to use info section
parameters:
- name: service-id
@@ -73,7 +60,9 @@ parameters:
http:
service:
- auth: none
+ name: so
+ version: v3
+ auth: basic
mode: direct
request:
uri: /ecomp/mso/infra/serviceInstances/v3/${service-id}
diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/vf-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-1.1.yaml
index 7b008e28..faf9cfa4 100644
--- a/plugins/so/src/main/resources/onap-cli-schema/services/vf-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vf-create
description: Create a VF
-version: onap-1.1
-service:
- name: so
- version: v3
- auth: basic
- mode: direct
+info:
+ product: onap-1.1
+ service: so
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
parameters:
- name: cloud-region
@@ -104,6 +103,11 @@ results:
scope: short
http:
+ service:
+ name: so
+ version: v3
+ auth: basic
+ mode: direct
request:
uri: /ecomp/mso/infra/serviceInstances/v3/${service-instance-id}/vnfs
method: POST
diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/vf-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-1.1.yaml
index ff5304ff..c706c931 100644
--- a/plugins/so/src/main/resources/onap-cli-schema/services/vf-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-1.1.yaml
@@ -1,12 +1,12 @@
open_cli_schema_version: 1.0
name: vf-delete
description: delete a VF (experimental)
-version: onap-1.1
-service:
- name: so
- version: v3
- auth: basic
- mode: direct
+info:
+ product: onap-1.1
+ service: so
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+
parameters:
- name: vf-id
description: id for vnf
@@ -57,6 +57,11 @@ parameters:
long_option: model-version
is_optional: false
http:
+ service:
+ name: so
+ version: v3
+ auth: basic
+ mode: direct
request:
uri: /ecomp/mso/infra/serviceInstances/v3/${service-instance-id}/vnfs/${vf-id}
method: DELETE
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml
index 43e68059..9395f4a1 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml
@@ -61,7 +61,9 @@ results:
http:
service:
- auth: none
+ name: so
+ version: v3
+ auth: basic
mode: direct
request:
uri: ecomp/mso/infra/serviceInstances/v2/${service-instance-id}/vnfs/${vnf-instance-id}/vfModules
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml
index 7c910539..013ec68a 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml
@@ -1,24 +1,12 @@
open_cli_schema_version: 1.0
name: vfmodule-delete
-<<<<<<< a936ccab2b00d462f0b1f3e8318004f0414f07ef
+
description: delete a VF module (experimental)
-=======
-description: delete a VF module
-<<<<<<< e22e4b6be3fe804a926136cf9ffd03341920ff50
->>>>>>> Migrate plugins to use info section
-version: onap-1.1
-service:
- name: so
- version: v3
- auth: basic
- mode: direct
-=======
info:
product: onap-1.1
service: so
author: ONAP CLI Team onap-discuss@lists.onap.org
->>>>>>> Migrate plugins to use info section
parameters:
- name: vfmodule-id
@@ -72,7 +60,9 @@ parameters:
http:
service:
- auth: none
+ name: so
+ version: v3
+ auth: basic
mode: direct
request:
uri: /ecomp/mso/infra/serviceInstances/v3/${service-id}/vnfs/${vf-id}/vfModules/${vfmodule-id}
diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/vfmodule-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-1.1.yaml
index 52303e4e..c2537aea 100644
--- a/plugins/so/src/main/resources/onap-cli-schema/services/vfmodule-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-1.1.yaml
@@ -1,12 +1,11 @@
open_cli_schema_version: 1.0
name: vfmodule-create
description: Create a VF module
-version: onap-1.1
-service:
- name: so
- version: v3
- auth: basic
- mode: direct
+
+info:
+ product: onap-1.1
+ service: so
+ author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
- name: cloud-region
@@ -128,6 +127,11 @@ results:
scope: short
http:
+ service:
+ name: so
+ version: v3
+ auth: basic
+ mode: direct
request:
uri: /ecomp/mso/infra/serviceInstances/v3/${service-id}/vnfs/${vf-id}/vfModules
method: POST
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml
deleted file mode 100644
index 18df0c95..00000000
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-open_cli_schema_version: 1.0
-name: vnf-create
-description: Create a VNF
-
-info:
- product: onap-1.1
- service: so
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: lcp-cloudregion-id
- description: AIC LCP node location identifier
- type: string
- short_option: l
- long_option: lcp-cloudregion-id
- is_optional: false
- - name: tenant-id
- description: openstack tenant id (uuid)
- type: string
- short_option: z
- long_option: tenant-id
- is_optional: false
- - name: product-family-id
- description: UUID for product family (named service id in AAI)
- type: string
- short_option: w
- long_option: product-family-id
- is_optional: false
- - name: instance-name
- description: service instance name
- type: string
- short_option: i
- long_option: instance-name
- is_optional: false
- - name: supress-rollback
- description: rollback changes if instantiation fails.
- type: bool
- short_option: r
- long_option: supress-rollback
- is_optional: true
- - name: service-instance-id
- description: unique id for service instance
- type: string
- short_option: y
- long_option: service-instance-id
- is_optional: false
- - name: parenet-service-model
- description: parent service model name
- type: string
- short_option: x
- long_option: parenet-service-model
- is_optional: false
-
-results:
- direction: portrait
- attribute:
- - name: vnf-instance-id
- description: id for the created vnf
- type: string
- scope: short
-
-http:
- service:
- auth: none
- mode: direct
- request:
- uri: ecomp/mso/infra/serviceInstances/v2/${service-instance-id}/vnfs
- method: PUT
- body: '{"requestDetails":{"modelInfo":{"modelType":"vnf","modelInvariantId":"ff5256d1-5a33-55df-13ab-12abad84e7ff","modelNameVersionId":"fe6478e4-ea33-3346-ac12-ab121484a3fe","modelName":"vSAMP12","modelVersion":"1.0","modelCustomizationName":"vSAMP12 1"},"cloudConfiguration":{"lcpCloudRegionId": "${lcp-cloudregion-id}","tenantId":"${tenant-id}"},"requestInfo":{"instanceName":"${instance-name}","productFamilyId":"${product-family-id}","source":"VID","suppressRollback":"${supress-rollback}"},"relatedInstanceList":[{"relatedInstance":{"instanceId":"${service-instance-id}","modelInfo":{"modelType":"service","modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"${parenet-service-model}","modelVersion":"1.0"}}}],"requestParameters":{}}}'
-
- success_codes:
- - 202
- result_mpa:
- vnf-instance-id: $b{$.vnfInstanceId}
- sample_response:
- body: '{"vnfInstanceId":"234567AB"}'
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml
deleted file mode 100644
index 0c07ccbd..00000000
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-open_cli_schema_version: 1.0
-name: vnf-delete
-description: delete a VNF
-
-info:
- product: onap-1.1
- service: so
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: vnf-instance-id
- description: id for vnf
- type: string
- short_option: x
- long_option: vnf-instace-id
- is_optional: false
- - name: service-instance-id
- description: unique id for service instance
- type: string
- short_option: y
- long_option: service-instace-id
- is_optional: false
- - name: lcp-cloudregion-id
- description: AIC LCP node location identifier
- type: string
- short_option: l
- long_option: lcp-cloudregion-id
- is_optional: false
- - name: tenant-id
- description: openstack tenant id (uuid)
- type: string
- short_option: z
- long_option: tenant-id
- is_optional: false
-
-http:
- service:
- auth: none
- mode: direct
- request:
- uri: ecomp/mso/infra/serviceInstances/v2/${service-instance-id}/vnfs
- method: DELETE
- body: '{"requestDetails":{"modelInfo":{"modelType":"vnf","modelInvariantId":"ff5256d1-5a33-55df-13ab-12abad84e7ff","modelName":"vSAMP12","modelVersion":"1"},"cloudConfiguration":{"lcpCloudRegionId":"mdt1","tenantId":"88a6ca3ee0394ade9403f075db23167e"},"requestInfo":{"source":"VID"},"requestParameters":{"userParams":[]}}}'
-
- success_codes:
- - 202 \ No newline at end of file
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml
index c52d8000..e8fcb0f8 100644
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-create
version: onap-1.1
diff --git a/plugins/so/src/test/resources/onap-cli-sample/services/service-create-schema-1.1-moco.json b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-moco.json
index 28321085..28321085 100644
--- a/plugins/so/src/test/resources/onap-cli-sample/services/service-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-moco.json
diff --git a/plugins/so/src/test/resources/onap-cli-sample/services/service-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-sample.yaml
index ea32791a..4815ac39 100644
--- a/plugins/so/src/test/resources/onap-cli-sample/services/service-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-create
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml
index cc114ac0..f6fd2c77 100644
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: service-delete
version: onap-1.1
diff --git a/plugins/so/src/test/resources/onap-cli-sample/services/vf-create-schema-1.1-moco.json b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json
index 0d8a97b9..0d8a97b9 100644
--- a/plugins/so/src/test/resources/onap-cli-sample/services/vf-create-schema-1.1-moco.json
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json
diff --git a/plugins/so/src/test/resources/onap-cli-sample/services/vf-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-sample.yaml
index 0293b2ad..3b31d80c 100644
--- a/plugins/so/src/test/resources/onap-cli-sample/services/vf-create-schema-1.1-sample.yaml
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-sample.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vf-create
version: onap-1.1
samples:
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml
index b19bc54d..6ba9633b 100644
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vf-module-create
version: onap-1.1
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml
index 780e69d4..36a7f150 100644
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml
@@ -1,4 +1,4 @@
-onap_cli_sample_version: 1.0
+open_cli_sample_version: 1.0
name: vf-module-delete
version: onap-1.1
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-create-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-create-sample-1.1.yaml
deleted file mode 100644
index 267d3b9c..00000000
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-create-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vnf-create
-version: onap-1.1
-samples:
- sample1:
- name: Create a vnf
- input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -l region1 -t 123ABC -p a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb -i instance -r -s a445678da -m serviceA \ No newline at end of file
diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-delete-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-delete-sample-1.1.yaml
deleted file mode 100644
index bc3e89fb..00000000
--- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: vnf-delete
-version: onap-1.1
-samples:
- sample1:
- name: delete a vnf
- input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -v aca51b0a-710d-4155-bc7c-7cef19d9a94e -s ff305d54-75b4-431b-adb2-eb6b9e5ff000 -l mdt1 -t 88a6ca3ee0394ade9403f075db23167e \ No newline at end of file
diff --git a/plugins/onap-1.1/pom.xml b/plugins/onap-1.1/pom.xml
index 3b5dcaf0..fcde9060 100644
--- a/plugins/onap-1.1/pom.xml
+++ b/plugins/onap-1.1/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-onap-1.1</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index c74d56b2..5d1ac35e 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins</artifactId>
@@ -45,7 +45,7 @@
</dependencies>
<profiles>
<profile>
- <id>oclip-plugins</id>
+ <id>oclip</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -54,7 +54,7 @@
</modules>
</profile>
<profile>
- <id>onap-plugins</id>
+ <id>onap</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
diff --git a/plugins/sample/pom.xml b/plugins/sample/pom.xml
index 2283e9f0..113ac4b4 100644
--- a/plugins/sample/pom.xml
+++ b/plugins/sample/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.cli</groupId>
<artifactId>cli-plugins</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<artifactId>cli-plugins-sample</artifactId>
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-model-create-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-model-create-schema.yaml
deleted file mode 100644
index 58a8681a..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-model-create-schema.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-open_cli_schema_version: 1.0
-name: license-model-create
-description: Create License Model
-version: onap-1.0
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
-
-parameters:
- - name: vendor-name
- description: vendor name
- type: string
- short_option: x
- long_option: vendor-name
- is_optional: false
- - name: license-model-description
- description: Description for License Model
- type: string
- short_option: y
- long_option: license-model-description
- is_optional: true
-results:
- direction: portrait
- attributes:
- - name: ID
- description: License Model ID
- scope: short
- type: string
-http:
- request:
- uri: /onboarding-api/v1.0/vendor-license-models
- method: POST
- body: '{"vendorName": "${vendor-name}", "description": "${license-model-description}", "iconRef": "icon"}'
- success_codes:
- - 200
- result_map:
- ID: $b{$.value}
- sample_response:
- body: '{"value":"2DEB6CB4B082415BB7A697C9CD1273BA"}'
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-model-show-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-model-show-schema.yaml
deleted file mode 100644
index 52803f7f..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-model-show-schema.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-open_cli_schema_version: 1.0
-name: license-model-show
-description: Details of the License Model
-version: onap-1.0
-service:
- name: sdc
- version: v1.0
- auth: basic
- mode: direct
-
-parameters:
- - name: license-model-id
- description: Onap License Model ID
- type: string
- short_option: x
- long_option: license-model-id
- is_optional: false
-
-results:
- direction: landscape
- attributes:
- - name: name
- description: License Model Name
- scope: short
- type: string
- - name: ID
- description: License Model ID
- scope: short
- type: string
- - name: description
- description: Description for the License Model
- scope: short
- type: string
- - name: status
- description: Status of the License Model
- scope: short
- type: string
-http:
- request:
- uri: /onboarding-api/v1.0/vendor-license-models/${license-model-id}
- method: GET
- success_codes:
- - 200
- result_map:
- name: $b{$.vendorName}
- ID: $b{$.id}
- description: $b{$.description}
- status: $b{$.status}
- sample_response:
- body: '{"vendorName": "5aa8a88c","description": "vendor license model","iconRef": "icon","id": "109F0F948B974D998D89893A1BD39D4A","version": "0.1","status": "Locked","lockingUser": "cs0008","viewableVersions": ["0.1"]}'