From 9a7c3f58efc9a4fcff5052700457cf6f7565cf39 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Tue, 14 Nov 2017 11:50:31 +0530 Subject: Merges from 1.1.0 Issue-Id: CLI-66 Change-Id: I89fde334e2425eb91630912d726c320ece4aebd6 Signed-off-by: Kanagaraj Manickam k00365106 --- framework/pom.xml | 2 +- .../open-cli-schema/http/basic-login.yaml | 2 +- .../open-cli-schema/http/basic-logout.yaml | 2 +- .../resources/open-cli-schema/http/catalog.yaml | 2 +- .../resources/open-cli-schema/schema-refresh.yaml | 2 +- .../resources/open-cli-schema/schema-validate.yaml | 2 +- .../onap-cli-sample/schema-refresh-sample.yaml | 240 --------------------- .../onap-cli-sample/schema-validate-sample.yaml | 14 -- framework/src/test/resources/onap-test-schema.yaml | 84 -------- .../open-cli-sample/schema-refresh-sample.yaml | 240 +++++++++++++++++++++ .../open-cli-sample/schema-validate-sample.yaml | 14 ++ .../open-cli-schema/sample-test-schema.yaml | 2 +- .../open-cli-schema/sample-test1-schema-http.yaml | 2 +- .../resources/open-cli-schema/testauth-login.yaml | 2 +- .../resources/open-cli-schema/testauth-logout.yaml | 2 +- framework/src/test/resources/sample-test-info.yaml | 2 +- ...e-test-invalid-schema-duplicate-longoption.yaml | 2 +- .../sample-test-invalid-schema-duplicate-name.yaml | 2 +- ...-test-invalid-schema-duplicate-shortoption.yaml | 2 +- .../test/resources/sample-test-invalid-schema.yaml | 2 +- .../sample-test-schema-auth-required.yaml | 2 +- .../test/resources/sample-test-schema-http.yaml | 2 +- .../sample-test-schema-no-auth-no-catalog.yaml | 2 +- .../sample-test-schema-no-auth-yes-catalog.yaml | 2 +- .../test/resources/sample-test-schema-swagger.yaml | 2 +- .../sample-test-schema-yes-auth-no-catalog.yaml | 2 +- ...yes-auth-with-additional-params-no-catalog.yaml | 2 +- .../sample-test-schema-yes-auth-yes-catalog.yaml | 2 +- .../src/test/resources/schema-validate-basic.yaml | 2 +- .../src/test/resources/schema-validate-http.yaml | 2 +- .../test/resources/schema-validate-invalid.yaml | 2 +- .../schema-validate-invalidschematype.yaml | 2 +- .../src/test/resources/schema-validate-pass.yaml | 2 +- 33 files changed, 282 insertions(+), 366 deletions(-) delete mode 100644 framework/src/test/resources/onap-cli-sample/schema-refresh-sample.yaml delete mode 100644 framework/src/test/resources/onap-cli-sample/schema-validate-sample.yaml delete mode 100644 framework/src/test/resources/onap-test-schema.yaml create mode 100644 framework/src/test/resources/open-cli-sample/schema-refresh-sample.yaml create mode 100644 framework/src/test/resources/open-cli-sample/schema-validate-sample.yaml (limited to 'framework') diff --git a/framework/pom.xml b/framework/pom.xml index ce49164b..231d804b 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -24,7 +24,7 @@ org.onap.cli cli - 1.0.0-SNAPSHOT + 2.0.0 cli-framework diff --git a/framework/src/main/resources/open-cli-schema/http/basic-login.yaml b/framework/src/main/resources/open-cli-schema/http/basic-login.yaml index dab9652e..36473df7 100644 --- a/framework/src/main/resources/open-cli-schema/http/basic-login.yaml +++ b/framework/src/main/resources/open-cli-schema/http/basic-login.yaml @@ -8,7 +8,7 @@ info: product: open-cli service: basic-auth type: auth - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com results: direction: portrait diff --git a/framework/src/main/resources/open-cli-schema/http/basic-logout.yaml b/framework/src/main/resources/open-cli-schema/http/basic-logout.yaml index ef60006c..f4acc0ae 100644 --- a/framework/src/main/resources/open-cli-schema/http/basic-logout.yaml +++ b/framework/src/main/resources/open-cli-schema/http/basic-logout.yaml @@ -8,7 +8,7 @@ info: product: open-cli service: basic-auth type: auth - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: host-username diff --git a/framework/src/main/resources/open-cli-schema/http/catalog.yaml b/framework/src/main/resources/open-cli-schema/http/catalog.yaml index d3ee9992..508955f5 100644 --- a/framework/src/main/resources/open-cli-schema/http/catalog.yaml +++ b/framework/src/main/resources/open-cli-schema/http/catalog.yaml @@ -8,7 +8,7 @@ info: product: open-cli service: catalog type: catalog - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: catalog-service-name diff --git a/framework/src/main/resources/open-cli-schema/schema-refresh.yaml b/framework/src/main/resources/open-cli-schema/schema-refresh.yaml index e5c9b56f..2a80cf7c 100644 --- a/framework/src/main/resources/open-cli-schema/schema-refresh.yaml +++ b/framework/src/main/resources/open-cli-schema/schema-refresh.yaml @@ -6,7 +6,7 @@ info: product: open-cli service: schema type: auth - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com results: direction: landscape diff --git a/framework/src/main/resources/open-cli-schema/schema-validate.yaml b/framework/src/main/resources/open-cli-schema/schema-validate.yaml index c17b3a08..98ac8c25 100644 --- a/framework/src/main/resources/open-cli-schema/schema-validate.yaml +++ b/framework/src/main/resources/open-cli-schema/schema-validate.yaml @@ -6,7 +6,7 @@ info: product: open-cli service: schema type: auth - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: schema-location diff --git a/framework/src/test/resources/onap-cli-sample/schema-refresh-sample.yaml b/framework/src/test/resources/onap-cli-sample/schema-refresh-sample.yaml deleted file mode 100644 index 80e34844..00000000 --- a/framework/src/test/resources/onap-cli-sample/schema-refresh-sample.yaml +++ /dev/null @@ -1,240 +0,0 @@ -onap_cli_sample_version: 1.0 -name: schema-refresh -version: cli-1.0 -samples: - sample1: - name: schema-refresh - input: - moco: schema-refresh-moco.json - output: | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |sl-no |command |product-version |schema |version | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |1 |vfmodule-create |onap-1.1 |vfmodule-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |2 |schema-validate |cli-1.0 |schema-validate.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |3 |schema-refresh |cli-1.0 |schema-refresh.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |4 |cloud-list |onap-1.1 |cloud-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |5 |sdnc-list |onap-1.1 |sdnc-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |6 |sdnc-register |onap-1.1 |sdnc-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |7 |sdnc-unregister |onap-1.1 |sdnc-delete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |8 |vnfm-show |onap-1.1 |vnfm-show-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |9 |vnfm-unregister |onap-1.1 |vnfm-delete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |10 |vnfm-register |onap-1.1 |vnfm-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |11 |vnfm-list |onap-1.1 |vnfm-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |12 |vim-register |onap-1.1 |vim-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |13 |vim-unregister |onap-1.1 |vim-delete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |14 |vim-list |onap-1.1 |vim-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |15 |ems-list |onap-1.1 |ems-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |16 |ems-register |onap-1.1 |ems-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |17 |ems-show |onap-1.1 |ems-show-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |18 |cloud-delete |onap-1.1 |cloud-delete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |19 |ems-unregister |onap-1.1 |ems-delete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |20 |subscription-list |onap-1.0 |subscription-list-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |21 |subscription-create |onap-1.0 |subscription-create-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |22 |subscription-list |onap-1.1 |subscription-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |23 |subscription-create |onap-1.1 |subscription-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |24 |subscription-delete |onap-1.1 |subscription-delete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |25 |customer-show |onap-1.0 |customer-show-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |26 |customer-show |onap-1.1 |customer-show-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |27 |customer-list |onap-1.0 |customer-list-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |28 |customer-delete |onap-1.0 |customer-delete-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |29 |customer-create |onap-1.0 |customer-create-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |30 |customer-create |onap-1.1 |customer-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |31 |customer-delete |onap-1.1 |customer-delete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |32 |customer-list |onap-1.1 |customer-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |33 |vf-list |onap-1.1 |vf-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |34 |service-list |onap-1.1 |service-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |35 |vf-show |onap-1.1 |vf-show-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |36 |tenant-create |onap-1.1 |tenant-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |37 |tenant-list |onap-1.1 |tenant-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |38 |tenant-delete |onap-1.1 |tenant-delete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |39 |service-type-create |onap-1.0 |service-type-create-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |40 |service-type-list |onap-1.1 |service-type-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |41 |service-type-create |onap-1.1 |service-type-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |42 |service-type-delete |onap-1.0 |service-type-delete-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |43 |service-type-list |onap-1.0 |service-type-list-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |44 |service-type-delete |onap-1.1 |service-type-delete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |45 |cloud-create |onap-1.1 |cloud-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |46 |cloud-list |onap-1.0 |cloud-list-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |47 |microservice-delete |onap-1.1 |microservice-delete-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |48 |microservice-list |onap-1.1 |microservice-list-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |49 |microservice-show |onap-1.1 |microservice-show-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |50 |microservice-create |onap-1.1 |microservice-create-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |51 |hello-world |sample-1.0 |hello-world.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |52 |hello-world-http |sample-1.0 |hello-world-http.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |53 |vlm-checkin |onap-1.1 |vlm-checkin-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |54 |license-group-create |onap-1.0 |license-group-create-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |55 |vlm-key-group-create |onap-1.1 |vlm-key-group-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |56 |vlm-aggreement-list |onap-1.1 |vlm-aggreement-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |57 |vlm-key-group-list |onap-1.1 |vlm-key-group-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |58 |vlm-create |onap-1.1 |vlm-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |59 |vlm-entitlement-pool-create |onap-1.1 |vlm-entitlement-pool-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |60 |ep-show |onap-1.0 |license-entitlement-pool-show-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |61 |license-model-create |onap-1.0 |license-model-create-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |62 |license-group-show |onap-1.0 |license-group-show-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |63 |vsp-upload |onap-1.0 |vsp-upload-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |64 |vsp-package |onap-1.1 |vsp-package-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |65 |vsp-submit |onap-1.1 |vsp-submit-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |66 |vsp-checkout |onap-1.1 |vsp-checkout-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |67 |vsp-create |onap-1.0 |vsp-create-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |68 |vsp-list |onap-1.0 |vsp-list-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |69 |vsp-show |onap-1.1 |vsp-show-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |70 |vsp-show |onap-1.0 |vsp-show-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |71 |vsp-submit |onap-1.0 |vsp-submit-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |72 |vsp-create |onap-1.1 |vsp-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |73 |vsp-add-artifact |onap-1.1 |vsp-add-artifact-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |74 |vsp-revert |onap-1.1 |vsp-revert-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |75 |vsp-checkin |onap-1.0 |vsp-checkin-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |76 |vsp-checkout |onap-1.1 |vsp-checkout-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |77 |vsp-validate |onap-1.1 |vsp-validate-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |78 |vsp-list |onap-1.1 |vsp-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |79 |vsp-checkin |onap-1.1 |vsp-checkin-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |80 |service-model-checkin |onap-1.1 |service-model-checkin-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |81 |service-model-distribute |onap-1.1 |service-model-distribute-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |82 |service-model-list |onap-1.1 |service-model-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |83 |service-model-certify-start |onap-1.1 |service-model-certify-start-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |84 |service-model-add-vf |onap-1.1 |service-model-add-vf-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |85 |service-model-certify-request |onap-1.1 |service-model-certify-request-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |86 |service-model-revert |onap-1.1 |service-model-checkout-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |87 |service-model-checkout |onap-1.1 |service-model-revert-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |88 |service-model-certify-complete |onap-1.1 |service-model-certify-complete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |89 |service2vf-model-list |onap-1.1 |service2vf-model-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |90 |service-model-create |onap-1.1 |service-model-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |91 |service-model-approve |onap-1.1 |service-model-approve-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |92 |vf-model-create |onap-1.1 |vf-model-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |93 |vf-model-checkin |onap-1.1 |vf-model-checkin-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |94 |vlm-revert |onap-1.1 |vlm-revert-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |95 |vlm-feature-group-create |onap-1.1 |vlm-feature-group-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |96 |vlm-submit |onap-1.1 |vlm-submit-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |97 |license-model-show |onap-1.0 |license-model-show-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |98 |vf-model-certify-start |onap-1.1 |vf-model-certify-start-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |99 |vf-model-list |onap-1.1 |vf-model-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |100 |vlm-entitlement-pool-list |onap-1.1 |vlm-entitlement-pool-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |101 |vlm-feature-group-list |onap-1.1 |vlm-feature-group-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |102 |vlm-checkout |onap-1.1 |vlm-checkout-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |103 |vlm-list |onap-1.1 |vlm-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |104 |vlm-aggreement-create |onap-1.1 |vlm-aggreement-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |105 |vf-model-certify-request |onap-1.1 |vf-model-certify-request-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |106 |ep-create |onap-1.0 |license-entitlement-pool-create-schema.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |107 |vf2vfmodule-model-list |onap-1.1 |vf2vfmodule-model-list-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |108 |vf-model-certify-complete |onap-1.1 |vf-model-certify-complete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |109 |service-delete |onap-1.1 |service-delete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |110 |vfmodule-delete |onap-1.1 |vf-module-delete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |111 |vfmodule-create |onap-1.1 |vfmodule-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |112 |service-create |onap-1.1 |service-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |113 |vf-delete |onap-1.1 |vf-delete-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ - |114 |vf-create |onap-1.1 |vf-create-schema-1.1.yaml |1.0 | - +--------+--------------------------------+------------------+------------------------------------------------+----------+ diff --git a/framework/src/test/resources/onap-cli-sample/schema-validate-sample.yaml b/framework/src/test/resources/onap-cli-sample/schema-validate-sample.yaml deleted file mode 100644 index fd7c1611..00000000 --- a/framework/src/test/resources/onap-cli-sample/schema-validate-sample.yaml +++ /dev/null @@ -1,14 +0,0 @@ -onap_cli_sample_version: 1.0 -name: schema-validate -version: cli-1.0 -samples: - sample1: - name: schema-validate - input: -l /home/ubuntu/dev/onap/cli/deployment/zip/target/deployunzip/onap-cli-schema/vfmodule-create-schema-1.1.yaml - moco: schema-validate-moco.json - output: | - +--------+--------+ - |sl-no |error | - +--------+--------+ - | | | - +--------+--------+ diff --git a/framework/src/test/resources/onap-test-schema.yaml b/framework/src/test/resources/onap-test-schema.yaml deleted file mode 100644 index 496cb023..00000000 --- a/framework/src/test/resources/onap-test-schema.yaml +++ /dev/null @@ -1,84 +0,0 @@ -open_cli_schema_version: 1.0 -name: sample-test -description: Oclip sample command to test the command features - -info: - product: open-cli - service: test - type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com - -parameters: - - name: bool-param - type: bool - description: Oclip boolean param, by default its always false. - short_option: b - long_option: bool - is_optional: true - default_value: false - - name: secure-param - type: string - description: Oclip secure param such as password - short_option: x - long_option: secure - is_secured: true - is_optional: false - default_Value: pass123# - - name: string-param - type: string - description: Oclip string param - long_option: string-param - short_option: c - is_optional: false - default_Value: test - - name: yaml-param - type: json - description: Oclip yaml file location param - long_option: yaml-param - short_option: y - is_optional: false - - name: json-param - type: json - description: Oclip json file location param - long_option: json-param - short_option: j - is_optional: false - - name: long-param - type: digit - description: Oclip long param - short_option: l - long_option: long-opt - is_optional: false - default_value: 10 - - name: url-param - type: url - description: Oclip url param - short_option: r - long_option: url - is_optional: false - default_value: http://localhost:8082/file.txt - - name: env-param - type: string - description: Oclip env param. - short_option: z - long_option: env - is_optional: false - default_value: ${ENV_VAR} - - name: positional-args - type: string - description: Oclip positional args, if no short option and no long option given for it - is_optional: false - default_value: http://localhost:8082/file.txt -results: - direction: portrait - attributes: - - name: output-1 - description: Oclip output attribute marked in short - scope: short - type: string - is_secured: true - - name: output-2 - description: Oclip output attribute marked in long - scope: short - is_secured: false - type: string \ No newline at end of file diff --git a/framework/src/test/resources/open-cli-sample/schema-refresh-sample.yaml b/framework/src/test/resources/open-cli-sample/schema-refresh-sample.yaml new file mode 100644 index 00000000..c24ea4d2 --- /dev/null +++ b/framework/src/test/resources/open-cli-sample/schema-refresh-sample.yaml @@ -0,0 +1,240 @@ +open_cli_sample_version: 1.0 +name: schema-refresh +version: cli-1.0 +samples: + sample1: + name: schema-refresh + input: + moco: schema-refresh-moco.json + output: | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |sl-no |command |product-version |schema |version | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |1 |vfmodule-create |onap-1.1 |vfmodule-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |2 |schema-validate |cli-1.0 |schema-validate.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |3 |schema-refresh |cli-1.0 |schema-refresh.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |4 |cloud-list |onap-1.1 |cloud-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |5 |sdnc-list |onap-1.1 |sdnc-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |6 |sdnc-register |onap-1.1 |sdnc-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |7 |sdnc-unregister |onap-1.1 |sdnc-delete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |8 |vnfm-show |onap-1.1 |vnfm-show-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |9 |vnfm-unregister |onap-1.1 |vnfm-delete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |10 |vnfm-register |onap-1.1 |vnfm-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |11 |vnfm-list |onap-1.1 |vnfm-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |12 |vim-register |onap-1.1 |vim-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |13 |vim-unregister |onap-1.1 |vim-delete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |14 |vim-list |onap-1.1 |vim-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |15 |ems-list |onap-1.1 |ems-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |16 |ems-register |onap-1.1 |ems-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |17 |ems-show |onap-1.1 |ems-show-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |18 |cloud-delete |onap-1.1 |cloud-delete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |19 |ems-unregister |onap-1.1 |ems-delete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |20 |subscription-list |onap-1.0 |subscription-list-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |21 |subscription-create |onap-1.0 |subscription-create-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |22 |subscription-list |onap-1.1 |subscription-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |23 |subscription-create |onap-1.1 |subscription-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |24 |subscription-delete |onap-1.1 |subscription-delete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |25 |customer-show |onap-1.0 |customer-show-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |26 |customer-show |onap-1.1 |customer-show-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |27 |customer-list |onap-1.0 |customer-list-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |28 |customer-delete |onap-1.0 |customer-delete-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |29 |customer-create |onap-1.0 |customer-create-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |30 |customer-create |onap-1.1 |customer-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |31 |customer-delete |onap-1.1 |customer-delete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |32 |customer-list |onap-1.1 |customer-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |33 |vf-list |onap-1.1 |vf-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |34 |service-list |onap-1.1 |service-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |35 |vf-show |onap-1.1 |vf-show-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |36 |tenant-create |onap-1.1 |tenant-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |37 |tenant-list |onap-1.1 |tenant-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |38 |tenant-delete |onap-1.1 |tenant-delete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |39 |service-type-create |onap-1.0 |service-type-create-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |40 |service-type-list |onap-1.1 |service-type-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |41 |service-type-create |onap-1.1 |service-type-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |42 |service-type-delete |onap-1.0 |service-type-delete-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |43 |service-type-list |onap-1.0 |service-type-list-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |44 |service-type-delete |onap-1.1 |service-type-delete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |45 |cloud-create |onap-1.1 |cloud-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |46 |cloud-list |onap-1.0 |cloud-list-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |47 |microservice-delete |onap-1.1 |microservice-delete-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |48 |microservice-list |onap-1.1 |microservice-list-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |49 |microservice-show |onap-1.1 |microservice-show-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |50 |microservice-create |onap-1.1 |microservice-create-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |51 |hello-world |sample-1.0 |hello-world.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |52 |hello-world-http |sample-1.0 |hello-world-http.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |53 |vlm-checkin |onap-1.1 |vlm-checkin-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |54 |license-group-create |onap-1.0 |license-group-create-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |55 |vlm-key-group-create |onap-1.1 |vlm-key-group-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |56 |vlm-aggreement-list |onap-1.1 |vlm-aggreement-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |57 |vlm-key-group-list |onap-1.1 |vlm-key-group-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |58 |vlm-create |onap-1.1 |vlm-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |59 |vlm-entitlement-pool-create |onap-1.1 |vlm-entitlement-pool-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |60 |ep-show |onap-1.0 |license-entitlement-pool-show-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |61 |license-model-create |onap-1.0 |license-model-create-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |62 |license-group-show |onap-1.0 |license-group-show-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |63 |vsp-upload |onap-1.0 |vsp-upload-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |64 |vsp-package |onap-1.1 |vsp-package-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |65 |vsp-submit |onap-1.1 |vsp-submit-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |66 |vsp-checkout |onap-1.1 |vsp-checkout-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |67 |vsp-create |onap-1.0 |vsp-create-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |68 |vsp-list |onap-1.0 |vsp-list-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |69 |vsp-show |onap-1.1 |vsp-show-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |70 |vsp-show |onap-1.0 |vsp-show-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |71 |vsp-submit |onap-1.0 |vsp-submit-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |72 |vsp-create |onap-1.1 |vsp-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |73 |vsp-add-artifact |onap-1.1 |vsp-add-artifact-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |74 |vsp-revert |onap-1.1 |vsp-revert-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |75 |vsp-checkin |onap-1.0 |vsp-checkin-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |76 |vsp-checkout |onap-1.1 |vsp-checkout-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |77 |vsp-validate |onap-1.1 |vsp-validate-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |78 |vsp-list |onap-1.1 |vsp-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |79 |vsp-checkin |onap-1.1 |vsp-checkin-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |80 |service-model-checkin |onap-1.1 |service-model-checkin-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |81 |service-model-distribute |onap-1.1 |service-model-distribute-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |82 |service-model-list |onap-1.1 |service-model-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |83 |service-model-certify-start |onap-1.1 |service-model-certify-start-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |84 |service-model-add-vf |onap-1.1 |service-model-add-vf-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |85 |service-model-certify-request |onap-1.1 |service-model-certify-request-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |86 |service-model-revert |onap-1.1 |service-model-checkout-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |87 |service-model-checkout |onap-1.1 |service-model-revert-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |88 |service-model-certify-complete |onap-1.1 |service-model-certify-complete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |89 |service2vf-model-list |onap-1.1 |service2vf-model-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |90 |service-model-create |onap-1.1 |service-model-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |91 |service-model-approve |onap-1.1 |service-model-approve-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |92 |vf-model-create |onap-1.1 |vf-model-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |93 |vf-model-checkin |onap-1.1 |vf-model-checkin-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |94 |vlm-revert |onap-1.1 |vlm-revert-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |95 |vlm-feature-group-create |onap-1.1 |vlm-feature-group-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |96 |vlm-submit |onap-1.1 |vlm-submit-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |97 |license-model-show |onap-1.0 |license-model-show-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |98 |vf-model-certify-start |onap-1.1 |vf-model-certify-start-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |99 |vf-model-list |onap-1.1 |vf-model-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |100 |vlm-entitlement-pool-list |onap-1.1 |vlm-entitlement-pool-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |101 |vlm-feature-group-list |onap-1.1 |vlm-feature-group-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |102 |vlm-checkout |onap-1.1 |vlm-checkout-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |103 |vlm-list |onap-1.1 |vlm-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |104 |vlm-aggreement-create |onap-1.1 |vlm-aggreement-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |105 |vf-model-certify-request |onap-1.1 |vf-model-certify-request-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |106 |ep-create |onap-1.0 |license-entitlement-pool-create-schema.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |107 |vf2vfmodule-model-list |onap-1.1 |vf2vfmodule-model-list-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |108 |vf-model-certify-complete |onap-1.1 |vf-model-certify-complete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |109 |service-delete |onap-1.1 |service-delete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |110 |vfmodule-delete |onap-1.1 |vf-module-delete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |111 |vfmodule-create |onap-1.1 |vfmodule-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |112 |service-create |onap-1.1 |service-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |113 |vf-delete |onap-1.1 |vf-delete-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ + |114 |vf-create |onap-1.1 |vf-create-schema-1.1.yaml |1.0 | + +--------+--------------------------------+------------------+------------------------------------------------+----------+ diff --git a/framework/src/test/resources/open-cli-sample/schema-validate-sample.yaml b/framework/src/test/resources/open-cli-sample/schema-validate-sample.yaml new file mode 100644 index 00000000..21cc4012 --- /dev/null +++ b/framework/src/test/resources/open-cli-sample/schema-validate-sample.yaml @@ -0,0 +1,14 @@ +open_cli_sample_version: 1.0 +name: schema-validate +version: cli-1.0 +samples: + sample1: + name: schema-validate + input: -l /home/ubuntu/dev/onap/cli/deployment/zip/target/deployunzip/onap-cli-schema/vfmodule-create-schema-1.1.yaml + moco: schema-validate-moco.json + output: | + +--------+--------+ + |sl-no |error | + +--------+--------+ + | | | + +--------+--------+ diff --git a/framework/src/test/resources/open-cli-schema/sample-test-schema.yaml b/framework/src/test/resources/open-cli-schema/sample-test-schema.yaml index 347e9123..3c4ace83 100644 --- a/framework/src/test/resources/open-cli-schema/sample-test-schema.yaml +++ b/framework/src/test/resources/open-cli-schema/sample-test-schema.yaml @@ -5,7 +5,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: bool-param type: bool diff --git a/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml b/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml index 72c7dc55..f162231f 100644 --- a/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml +++ b/framework/src/test/resources/open-cli-schema/sample-test1-schema-http.yaml @@ -6,7 +6,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: bool-param diff --git a/framework/src/test/resources/open-cli-schema/testauth-login.yaml b/framework/src/test/resources/open-cli-schema/testauth-login.yaml index 8f3a8339..3e9211ef 100644 --- a/framework/src/test/resources/open-cli-schema/testauth-login.yaml +++ b/framework/src/test/resources/open-cli-schema/testauth-login.yaml @@ -8,7 +8,7 @@ info: product: open-cli service: test type: auth - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: string-param diff --git a/framework/src/test/resources/open-cli-schema/testauth-logout.yaml b/framework/src/test/resources/open-cli-schema/testauth-logout.yaml index d8de7c6f..dfe33638 100644 --- a/framework/src/test/resources/open-cli-schema/testauth-logout.yaml +++ b/framework/src/test/resources/open-cli-schema/testauth-logout.yaml @@ -8,7 +8,7 @@ info: product: open-cli service: test type: auth - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com # followings are dummy simulator for http command http: diff --git a/framework/src/test/resources/sample-test-info.yaml b/framework/src/test/resources/sample-test-info.yaml index b80bfad7..f85d43c0 100644 --- a/framework/src/test/resources/sample-test-info.yaml +++ b/framework/src/test/resources/sample-test-info.yaml @@ -6,4 +6,4 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com diff --git a/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml b/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml index a0fb0d56..f3a0a1da 100644 --- a/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml +++ b/framework/src/test/resources/sample-test-invalid-schema-duplicate-longoption.yaml @@ -6,7 +6,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: bool-param diff --git a/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml b/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml index 0718f315..9986ff6b 100644 --- a/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml +++ b/framework/src/test/resources/sample-test-invalid-schema-duplicate-name.yaml @@ -5,7 +5,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: bool-param diff --git a/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml b/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml index d61bf6e9..0843faf2 100644 --- a/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml +++ b/framework/src/test/resources/sample-test-invalid-schema-duplicate-shortoption.yaml @@ -5,7 +5,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: bool-param type: bool diff --git a/framework/src/test/resources/sample-test-invalid-schema.yaml b/framework/src/test/resources/sample-test-invalid-schema.yaml index 06c45daa..06332505 100644 --- a/framework/src/test/resources/sample-test-invalid-schema.yaml +++ b/framework/src/test/resources/sample-test-invalid-schema.yaml @@ -5,7 +5,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: bool-param type: bool diff --git a/framework/src/test/resources/sample-test-schema-auth-required.yaml b/framework/src/test/resources/sample-test-schema-auth-required.yaml index 062388f1..bb919d9a 100644 --- a/framework/src/test/resources/sample-test-schema-auth-required.yaml +++ b/framework/src/test/resources/sample-test-schema-auth-required.yaml @@ -5,7 +5,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: bool-param type: bool diff --git a/framework/src/test/resources/sample-test-schema-http.yaml b/framework/src/test/resources/sample-test-schema-http.yaml index b5d91604..4ae6e9e0 100644 --- a/framework/src/test/resources/sample-test-schema-http.yaml +++ b/framework/src/test/resources/sample-test-schema-http.yaml @@ -5,7 +5,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: service-name description: Oclip service name diff --git a/framework/src/test/resources/sample-test-schema-no-auth-no-catalog.yaml b/framework/src/test/resources/sample-test-schema-no-auth-no-catalog.yaml index e3e48c59..2629a2f9 100644 --- a/framework/src/test/resources/sample-test-schema-no-auth-no-catalog.yaml +++ b/framework/src/test/resources/sample-test-schema-no-auth-no-catalog.yaml @@ -8,7 +8,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com http: diff --git a/framework/src/test/resources/sample-test-schema-no-auth-yes-catalog.yaml b/framework/src/test/resources/sample-test-schema-no-auth-yes-catalog.yaml index 0cdee7fe..15b5bf0c 100644 --- a/framework/src/test/resources/sample-test-schema-no-auth-yes-catalog.yaml +++ b/framework/src/test/resources/sample-test-schema-no-auth-yes-catalog.yaml @@ -9,7 +9,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com http: diff --git a/framework/src/test/resources/sample-test-schema-swagger.yaml b/framework/src/test/resources/sample-test-schema-swagger.yaml index 2d8086e5..4108d4e6 100644 --- a/framework/src/test/resources/sample-test-schema-swagger.yaml +++ b/framework/src/test/resources/sample-test-schema-swagger.yaml @@ -5,7 +5,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: user type: string diff --git a/framework/src/test/resources/sample-test-schema-yes-auth-no-catalog.yaml b/framework/src/test/resources/sample-test-schema-yes-auth-no-catalog.yaml index 0b418462..bb0ae46b 100644 --- a/framework/src/test/resources/sample-test-schema-yes-auth-no-catalog.yaml +++ b/framework/src/test/resources/sample-test-schema-yes-auth-no-catalog.yaml @@ -8,7 +8,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com http: diff --git a/framework/src/test/resources/sample-test-schema-yes-auth-with-additional-params-no-catalog.yaml b/framework/src/test/resources/sample-test-schema-yes-auth-with-additional-params-no-catalog.yaml index 4470e634..a5a39f92 100644 --- a/framework/src/test/resources/sample-test-schema-yes-auth-with-additional-params-no-catalog.yaml +++ b/framework/src/test/resources/sample-test-schema-yes-auth-with-additional-params-no-catalog.yaml @@ -9,7 +9,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com http: diff --git a/framework/src/test/resources/sample-test-schema-yes-auth-yes-catalog.yaml b/framework/src/test/resources/sample-test-schema-yes-auth-yes-catalog.yaml index ca22e1d1..4efd4c51 100644 --- a/framework/src/test/resources/sample-test-schema-yes-auth-yes-catalog.yaml +++ b/framework/src/test/resources/sample-test-schema-yes-auth-yes-catalog.yaml @@ -9,7 +9,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com http: diff --git a/framework/src/test/resources/schema-validate-basic.yaml b/framework/src/test/resources/schema-validate-basic.yaml index 14104879..982d6ceb 100644 --- a/framework/src/test/resources/schema-validate-basic.yaml +++ b/framework/src/test/resources/schema-validate-basic.yaml @@ -5,7 +5,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: service-name1 description: Oclip service name diff --git a/framework/src/test/resources/schema-validate-http.yaml b/framework/src/test/resources/schema-validate-http.yaml index 8228b179..7bdafc56 100644 --- a/framework/src/test/resources/schema-validate-http.yaml +++ b/framework/src/test/resources/schema-validate-http.yaml @@ -5,7 +5,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: service-name1 diff --git a/framework/src/test/resources/schema-validate-invalid.yaml b/framework/src/test/resources/schema-validate-invalid.yaml index 166e146b..06fa8c9e 100644 --- a/framework/src/test/resources/schema-validate-invalid.yaml +++ b/framework/src/test/resources/schema-validate-invalid.yaml @@ -5,7 +5,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: name description: Oclip SDNC name diff --git a/framework/src/test/resources/schema-validate-invalidschematype.yaml b/framework/src/test/resources/schema-validate-invalidschematype.yaml index 0d5e34ce..0c5ade5d 100644 --- a/framework/src/test/resources/schema-validate-invalidschematype.yaml +++ b/framework/src/test/resources/schema-validate-invalidschematype.yaml @@ -4,7 +4,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com name: schema-validate parameters: diff --git a/framework/src/test/resources/schema-validate-pass.yaml b/framework/src/test/resources/schema-validate-pass.yaml index 28da9547..79cf7794 100644 --- a/framework/src/test/resources/schema-validate-pass.yaml +++ b/framework/src/test/resources/schema-validate-pass.yaml @@ -5,7 +5,7 @@ info: product: open-cli service: test type: cmd - author: Kanagaraj Manickam mkr1481@gmail.com + author: Kanagaraj Manickam kanagaraj.manickam@huawei.com parameters: - name: name -- cgit 1.2.3-korg