From a4cd2403a5a171d6ab6aa6b1b0b1aae83345121b Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Tue, 29 Aug 2017 18:15:10 +0530 Subject: Add versioning for command By allowing to add version to the YAML, helps to create same command for multiple versions of product say onap 1.0, 1.1 CLI-37 Change-Id: Ic3982ea912045ff4f422fcf093cbd98ecd99716d Signed-off-by: Kanagaraj Manickam k00365106 --- .../cloud-region/cloud-list-schema-1.1.yaml | 52 +++++++++++++ .../cloud-region/cloud-list-schema.yaml | 1 + .../customer/customer-create-schema-1.1.yaml | 33 +++++++++ .../customer/customer-create-schema.yaml | 1 + .../customer/customer-delete-schema-1.1.yaml | 30 ++++++++ .../customer/customer-delete-schema.yaml | 1 + .../customer/customer-list-schema-1.1.yaml | 31 ++++++++ .../customer/customer-list-schema.yaml | 1 + .../customer/customer-show-schema-1.1.yaml | 50 +++++++++++++ .../customer/customer-show-schema.yaml | 1 + .../service-type-create-schema-1.1.yaml | 33 +++++++++ .../service-type/service-type-create-schema.yaml | 1 + .../service-type-delete-schema-1.1.yaml | 34 +++++++++ .../service-type/service-type-delete-schema.yaml | 1 + .../service-type/service-type-list-schema-1.1.yaml | 37 ++++++++++ .../service-type/service-type-list-schema.yaml | 1 + .../subscription-create-schema-1.1.yaml | 63 ++++++++++++++++ .../subscription/subscription-create-schema.yaml | 1 + .../subscription/subscription-list-schema-1.1.yaml | 40 ++++++++++ .../subscription/subscription-list-schema.yaml | 1 + .../cloud-region/cloud-list-sample.yaml | 2 +- .../cli/cmd/cs/msb/OnapServiceCreateCommand.java | 2 +- .../cli/cmd/cs/msb/OnapServiceDeleteCommand.java | 2 +- .../cli/cmd/cs/msb/OnapServiceListCommand.java | 2 +- .../cli/cmd/cs/msb/OnapServiceShowCommand.java | 2 +- .../main/resources/microservice-create-schema.yaml | 85 --------------------- .../main/resources/microservice-delete-schema.yaml | 31 -------- .../main/resources/microservice-list-schema.yaml | 49 ------------ .../main/resources/microservice-show-schema.yaml | 62 ---------------- .../microservice-create-schema.yaml | 86 ++++++++++++++++++++++ .../microservice-delete-schema.yaml | 32 ++++++++ .../onap-cli-schema/microservice-list-schema.yaml | 50 +++++++++++++ .../onap-cli-schema/microservice-show-schema.yaml | 63 ++++++++++++++++ .../src/test/resources/service-list-schema.yaml | 1 + .../msb/src/test/resources/user-create-schema.yaml | 1 + .../onap-cli-schema/vsp/vsp-checkin-schema.yaml | 2 +- .../onap-cli-schema/vsp/vsp-create-schema.yaml | 2 +- .../onap-cli-schema/vsp/vsp-list-schema.yaml | 2 +- .../onap-cli-schema/vsp/vsp-show-schema.yaml | 2 +- .../onap-cli-schema/vsp/vsp-submit-schema.yaml | 2 +- .../onap-cli-schema/vsp/vsp-upload-schema.yaml | 2 +- .../onap-cli-sample/vsp/vsp-checkin-sample.yaml | 2 +- .../onap-cli-sample/vsp/vsp-create-sample.yaml | 2 +- .../onap-cli-sample/vsp/vsp-list-sample.yaml | 2 +- .../onap-cli-sample/vsp/vsp-show-sample.yaml | 2 +- .../onap-cli-sample/vsp/vsp-submit-sample.yaml | 2 +- .../onap-cli-sample/vsp/vsp-upload-sample.yaml | 2 +- 47 files changed, 663 insertions(+), 244 deletions(-) create mode 100644 plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml create mode 100644 plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml create mode 100644 plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml create mode 100644 plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml create mode 100644 plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml create mode 100644 plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml create mode 100644 plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml create mode 100644 plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml create mode 100644 plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml create mode 100644 plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml delete mode 100644 plugins/msb/src/main/resources/microservice-create-schema.yaml delete mode 100644 plugins/msb/src/main/resources/microservice-delete-schema.yaml delete mode 100644 plugins/msb/src/main/resources/microservice-list-schema.yaml delete mode 100644 plugins/msb/src/main/resources/microservice-show-schema.yaml create mode 100644 plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml create mode 100644 plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml create mode 100644 plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml create mode 100644 plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml (limited to 'plugins') diff --git a/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml new file mode 100644 index 00000000..511e090a --- /dev/null +++ b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema-1.1.yaml @@ -0,0 +1,52 @@ +onap_cmd_schema_version: 1.0 +name: cloud-list +description: List the configured clouds and Onap service subscriptions +version: onap-1.1 +service: + name: aai + version: v8 + auth: basic + mode: direct + +results: + direction: landscape + attributes: + - name: cloud + description: Onap cloud + scope: short + type: string + - name: region + description: Onap cloud region + scope: short + type: string + - name: tenant + description: Onap cloud tenat + scope: long + type: string + - name: tenant-id + description: Onap cloud tenat id + scope: long + type: string + - name: customer + description: Onap cloud customer + scope: long + type: string + - name: service + description: Onap cloud service + scope: long + type: string +http: + request: + uri: /aai/v11/cloud-infrastructure/cloud-regions + method: GET + success_codes: + - 200 + result_map: + cloud: $b{cloud-region.[*].cloud-owner} + region: $b{cloud-region.[*].cloud-region-id} + tenant: $b{cloud-region.[*].tenants.tenant.[*].tenant-name} + tenant-id: $b{cloud-region.[*].tenants.tenant.[*].tenant-id} + customer: $b{cloud-region.[*].tenants.tenant.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'customer.global-customer-id')].relationship-value} + service: $b{cloud-region.[*].tenants.tenant.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'service-subscription.service-type')].relationship-value} + sample_response: + body: '{"cloud-region":[{"cloud-owner":"Rackspace","cloud-region-id":"RegionOne","cloud-type":"SharedNode","owner-defined-type":"OwnerType","cloud-region-version":"v1","cloud-zone":"CloudZone","resource-version":"1500729864","tenants":{"tenant":[{"tenant-id":"e69e6d64b44347509c3fc512391f34a6","tenant-name":"onap","resource-version":"1500729865","relationship-list":{"relationship":[{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"Demonstration"},{"relationship-key":"service-subscription.service-type","relationship-value":"vFW"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/Demonstration123/service-subscriptions/service-subscription/vFW/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"Demonstration123"},{"relationship-key":"service-subscription.service-type","relationship-value":"vFW"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/u1/service-subscriptions/service-subscription/vFW/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"u1"},{"relationship-key":"service-subscription.service-type","relationship-value":"vFW"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/u2/service-subscriptions/service-subscription/vFW/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"u2"},{"relationship-key":"service-subscription.service-type","relationship-value":"vFW"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/DemoCust_7151e36a-1a57-4993-b513-54134f2b8f19/service-subscriptions/service-subscription/vFW/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"DemoCust_7151e36a-1a57-4993-b513-54134f2b8f19"},{"relationship-key":"service-subscription.service-type","relationship-value":"vFW"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vLB/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"Demonstration"},{"relationship-key":"service-subscription.service-type","relationship-value":"vLB"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/Linan/service-subscriptions/service-subscription/vFW/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"Linan"},{"relationship-key":"service-subscription.service-type","relationship-value":"vFW"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/Linan/service-subscriptions/service-subscription/vLB/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"Linan"},{"relationship-key":"service-subscription.service-type","relationship-value":"vLB"}]}]}}]}}]}' diff --git a/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema.yaml index cb04aac7..1f231256 100644 --- a/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema.yaml +++ b/plugins/aai/src/main/resources/onap-cli-schema/cloud-region/cloud-list-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: cloud-list description: List the configured clouds and Onap service subscriptions +version: onap-1.0 service: name: aai version: v8 diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml new file mode 100644 index 00000000..a3d61b41 --- /dev/null +++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema-1.1.yaml @@ -0,0 +1,33 @@ +onap_cmd_schema_version: 1.0 +name: customer-create +description: Create a customer in Onap +version: onap-1.1 +service: + name: aai + version: v8 + auth: basic + mode: direct + +parameters: + - name: customer-name + description: Onap customer name + type: string + short_option: x + long_option: customer-name + is_optional: false + - name: subscriber-name + description: Onap subscriber name + type: string + short_option: y + long_option: subscriber-name + is_optional: false + +http: + request: + uri: /aai/v11/business/customers/customer/${customer-name} + method: PUT + body: '{"global-customer-id": "${customer-name}", "subscriber-name": "${subscriber-name}", "subscriber-type": "INFRA"}' + success_codes: + - 201 + sample_response: + body: '' diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema.yaml index 58c1a094..533cd71e 100644 --- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema.yaml +++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-create-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: customer-create description: Create a customer in Onap +version: onap-1.0 service: name: aai version: v8 diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml new file mode 100644 index 00000000..2e6c1ebc --- /dev/null +++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema-1.1.yaml @@ -0,0 +1,30 @@ +onap_cmd_schema_version: 1.0 +name: customer-delete +description: Delete a customer from Onap +version: onap-1.1 +service: + name: aai + version: v8 + auth: basic + mode: direct + +parameters: + - name: customer-name + description: Onap customer name + type: string + short_option: x + long_option: customer-name + is_optional: false + - name: resource-version + description: Onap customer resource version + type: uuid + short_option: y + long_option: resource-version + is_optional: true +http: + request: + uri: /aai/v11/business/customers/customer/${customer-name}?resource-version=${resource-version} + method: DELETE + success_codes: + - 204 + - 404 diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema.yaml index 4c3fe055..3baca5eb 100644 --- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema.yaml +++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-delete-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: customer-delete description: Delete a customer from Onap +version: onap-1.0 service: name: aai version: v8 diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml new file mode 100644 index 00000000..c49d3cbb --- /dev/null +++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema-1.1.yaml @@ -0,0 +1,31 @@ +onap_cmd_schema_version: 1.0 +name: customer-list +description: Lists the registetred customers in Onap +version: onap-1.1 +service: + name: aai + version: v8 + auth: basic + mode: direct +results: + direction: landscape + attributes: + - name: name + description: Onap customer name + scope: short + type: string + - name: resource-version + description: Onap customer resource version + scope: short + type: string +http: + request: + uri: /aai/v11/business/customers + method: GET + success_codes: + - 200 + result_map: + name: $b{customer.[*].global-customer-id} + resource-version: $b{customer.[*].resource-version} + sample_response: + body: '{"customer":[{"global-customer-id":"Demonstration","subscriber-name":"Demonstration","subscriber-type":"INFRA","resource-version":"1500729865","service-subscriptions":{"service-subscription":[{"service-type":"vFW","resource-version":"1500729865","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}},{"service-type":"vLB","resource-version":"1500729865","service-instances":{"service-instance":[{"service-instance-id":"d6167ea1-ff83-4236-9b32-37494dfb7537","service-instance-name":"demoVLB-1","persona-model-id":"af01a849-721b-407d-a880-be836e26ee81","persona-model-version":"1.0","resource-version":"1501154574","relationship-list":{"relationship":[{"related-to":"generic-vnf","related-link":"https://192.168.17.12:8443/aai/v8/network/generic-vnfs/generic-vnf/16c6d95d-44e3-4527-aa63-a495bf8e776e/","relationship-data":[{"relationship-key":"generic-vnf.vnf-id","relationship-value":"16c6d95d-44e3-4527-aa63-a495bf8e776e"}],"related-to-property":[{"property-key":"generic-vnf.vnf-name","property-value":"demoVLB-1-VNF-1"}]}]}}]},"relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}}]}},{"global-customer-id":"Linan","subscriber-name":"Linan","subscriber-type":"INFRA","resource-version":"1501768482","service-subscriptions":{"service-subscription":[{"service-type":"vFW","resource-version":"1501768482","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}},{"service-type":"vLB","resource-version":"1501768482","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}}]}},{"global-customer-id":"DemoCust_7151e36a-1a57-4993-b513-54134f2b8f19","subscriber-name":"DemoCust_7151e36a-1a57-4993-b513-54134f2b8f19","subscriber-type":"INFRA","resource-version":"1501766760","service-subscriptions":{"service-subscription":[{"service-type":"vFW","resource-version":"1501766760","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}}]}}]}' \ No newline at end of file diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema.yaml index a4f701b9..79c4e20a 100644 --- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema.yaml +++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-list-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: customer-list description: Lists the registetred customers in Onap +version: onap-1.0 service: name: aai version: v8 diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml new file mode 100644 index 00000000..c7a39bcb --- /dev/null +++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema-1.1.yaml @@ -0,0 +1,50 @@ +onap_cmd_schema_version: 1.0 +name: customer-show +description: Lists the registetred customers in Onap +version: onap-1.1 +service: + name: aai + version: v8 + auth: basic + mode: direct + +parameters: + - name: customer-name + description: Onap customer name + type: string + short_option: x + long_option: customer-name + is_optional: false + +results: + direction: landscape + attributes: + - name: name + description: Onap customer name + scope: short + type: string + - name: subscriber-name + description: Onap subscriber name + scope: short + type: string + - name: resource-version + description: Onap subscriber resource version + scope: long + type: string + - name: subscriber-type + description: Onap subscriber type + scope: long + type: string +http: + request: + uri: /aai/v11/business/customers/customer/${customer-name} + method: GET + success_codes: + - 200 + result_map: + name: $b{$.global-customer-id} + subscriber-name: $b{$.subscriber-name} + subscriber-type: $b{$.subscriber-type} + resource-version: $b{$.resource-version} + sample_response: + body: '{"global-customer-id":"Linan","subscriber-name":"Linan","subscriber-type":"INFRA","resource-version":"1501768482","service-subscriptions":{"service-subscription":[{"service-type":"vFW","resource-version":"1501768482","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}},{"service-type":"vLB","resource-version":"1501768482","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}}]}}' diff --git a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema.yaml index 7923779a..ff5a5c71 100644 --- a/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema.yaml +++ b/plugins/aai/src/main/resources/onap-cli-schema/customer/customer-show-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: customer-show description: Lists the registetred customers in Onap +version: onap-1.0 service: name: aai version: v8 diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml new file mode 100644 index 00000000..a91f005b --- /dev/null +++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema-1.1.yaml @@ -0,0 +1,33 @@ +onap_cmd_schema_version: 1.0 +name: service-type-create +description: Add a service type in Onap +version: onap-1.1 +service: + name: aai + version: v8 + auth: basic + mode: direct + +parameters: + - name: service-type + description: Onap service type + type: string + short_option: x + long_option: service-type + is_optional: false + - name: service-type-id + description: Onap service type uuid + type: uuid + short_option: y + long_option: service-type-id + is_optional: true + +http: + request: + uri: /aai/v11/service-design-and-creation/services/service/${service-type-id} + method: PUT + body: '{"service-description": "${service-type}", "service-id": "${service-type-id}"}' + success_codes: + - 201 + sample_response: + body: '' diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema.yaml index ad11c35d..0f5eea1f 100644 --- a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema.yaml +++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-create-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: service-type-create description: Add a service type in Onap +version: onap-1.0 service: name: aai version: v8 diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml new file mode 100644 index 00000000..30296a94 --- /dev/null +++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema-1.1.yaml @@ -0,0 +1,34 @@ +onap_cmd_schema_version: 1.0 +name: service-type-delete +description: Delete a service type from Onap +version: onap-1.1 +service: + name: aai + version: v8 + auth: basic + mode: direct + +parameters: + - name: service-type-id + description: Onap service type uuid + type: uuid + short_option: x + long_option: service-type-id + is_optional: true + - name: resource-version + description: Onap service resource version + type: uuid + short_option: y + long_option: resource-version + is_optional: true +http: + request: + uri: /aai/v11/service-design-and-creation/services/service/${service-type-id}?resource-version=${resource-version} + queries: + resource-version: ${resource-version} + method: DELETE + success_codes: + - 204 + - 404 + sample_response: + body: '' diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema.yaml index a2eecd93..d007a05c 100644 --- a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema.yaml +++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-delete-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: service-type-delete description: Delete a service type from Onap +version: onap-1.0 service: name: aai version: v8 diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml new file mode 100644 index 00000000..ac57b05b --- /dev/null +++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema-1.1.yaml @@ -0,0 +1,37 @@ +onap_cmd_schema_version: 1.0 +name: service-type-list +description: List the service types configured in Onap +version: onap-1.1 +service: + name: aai + version: v8 + auth: basic + mode: direct + +results: + direction: landscape + attributes: + - name: service-type-id + description: Onap cloud service + scope: short + type: string + - name: service-type + description: Onap cloud service + scope: short + type: string + - name: resource-version + description: Onap cloud service resource version + scope: short + type: string +http: + request: + uri: /aai/v11/service-design-and-creation/services + method: GET + success_codes: + - 200 + result_map: + service-type: $b{service.[*].service-description} + service-type-id: $b{service.[*].service-id} + resource-version: $b{service.[*].resource-version} + sample_response: + body: '{"service":[{"service-id":"db3403eb-5c94-4295-bb00-a9dba8964ab3","service-description":"vFW","resource-version":"1500729865"},{"service-id":"33737156-ff09-4b3d-884a-fe9a372afa4e","service-description":"vLB","resource-version":"1500729866"}]}' diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema.yaml index 7be38f1c..a81b6d95 100644 --- a/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema.yaml +++ b/plugins/aai/src/main/resources/onap-cli-schema/service-type/service-type-list-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: service-type-list description: List the service types configured in Onap +version: onap-1.0 service: name: aai version: v8 diff --git a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml new file mode 100644 index 00000000..9b86330e --- /dev/null +++ b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema-1.1.yaml @@ -0,0 +1,63 @@ +onap_cmd_schema_version: 1.0 +name: subscription-create +description: Create a subscription for a customer in Onap +version: onap-1.1 +service: + name: aai + version: v8 + auth: basic + mode: direct + +parameters: + - name: customer-name + description: Onap customer name + type: string + short_option: x + long_option: customer-name + is_optional: false + - name: subscriber-name + description: Onap subscriber name + type: string + short_option: y + long_option: subscriber-name + is_optional: false + - name: cloud-type + description: Onap cloud type (openstack, rackspace) + type: string + short_option: z + long_option: cloud-type + is_optional: false + - name: cloud-region + description: Onap cloud region + type: string + short_option: r + long_option: cloud-region + is_optional: false + - name: cloud-tenant-id + description: Onap cloud tenant id + type: string + short_option: c + long_option: cloud-tenant-id + is_optional: false + - name: service-type + description: Onap service type + type: string + short_option: e + long_option: service-type + is_optional: false + - name: resource-version + description: Onap subscription resource version. It is mandatory for existing customer to create a new subscription + type: string + short_option: g + long_option: resource-version + is_optional: true +http: + request: + uri: /aai/v11/business/customers/customer/${customer-name} + method: PUT + body: '{"global-customer-id": "${customer-name}", "subscriber-name": "${subscriber-name}", "subscriber-type": "INFRA", "resource-version":"${resource-version}", "service-subscriptions":{"service-subscription":[{"relationship-list":{"relationship":[{"related-to":"tenant","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"${cloud-type}"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"${cloud-region}"},{"relationship-key":"tenant.tenant-id","relationship-value":"${cloud-tenant-id}"}]}]},"service-type":"${service-type}"}]}}}' + success_codes: + - 200 + - 201 + sample_response: + body: '' diff --git a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema.yaml index 58b5fc53..9bd67350 100644 --- a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema.yaml +++ b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-create-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: subscription-create description: Create a subscription for a customer in Onap +version: onap-1.0 service: name: aai version: v8 diff --git a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml new file mode 100644 index 00000000..b4d1093c --- /dev/null +++ b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema-1.1.yaml @@ -0,0 +1,40 @@ +onap_cmd_schema_version: 1.0 +name: subscription-list +description: Lists the subscription for a given customer in Onap +version: onap-1.1 +service: + name: aai + version: v8 + auth: basic + mode: direct + +parameters: + - name: customer-name + description: Onap customer name + type: string + short_option: x + long_option: customer-name + is_optional: false + +results: + direction: landscape + attributes: + - name: service-type + description: Onap service type + scope: short + type: string + +http: + request: + uri: /aai/v11/business/customers/customer/${customer-name} + method: GET + success_codes: + - 200 + result_map: + service-type: $b{$.service-subscriptions.service-subscription.[*].service-type} + sample_response: + body: '{"global-customer-id":"Linan","subscriber-name":"Linan","subscriber-type":"INFRA","resource-version":"1501768482","service-subscriptions":{"service-subscription":[{"service-type":"vFW","resource-version":"1501768482","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}},{"service-type":"vLB","resource-version":"1501768482","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}}]}}' + + + + diff --git a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema.yaml b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema.yaml index e3131eb0..f3bb9f7f 100644 --- a/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema.yaml +++ b/plugins/aai/src/main/resources/onap-cli-schema/subscription/subscription-list-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: subscription-list description: Lists the subscription for a given customer in Onap +version: onap-1.0 service: name: aai version: v8 diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample.yaml index 55e65a99..95ea4112 100644 --- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample.yaml +++ b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample.yaml @@ -1,7 +1,7 @@ onap_cli_sample_version: 1.0 name: cloud-list - +version: onap-1.0 samples: sample1: name: List the configured clouds in onap diff --git a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java index 8b46e6b8..4246d654 100644 --- a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java +++ b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java @@ -19,6 +19,6 @@ package org.onap.cli.cmd.cs.msb; import org.onap.cli.fw.OnapCommandSchema; import org.onap.cli.fw.cmd.OnapHttpCommand; -@OnapCommandSchema(name = "microservice-create", schema = "microservice-create-schema.yaml") +@OnapCommandSchema(name = "microservice-create", version = "onap-1.0", schema = "microservice-create-schema.yaml") public class OnapServiceCreateCommand extends OnapHttpCommand { } diff --git a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java index 595934d9..5522723b 100644 --- a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java +++ b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java @@ -19,6 +19,6 @@ package org.onap.cli.cmd.cs.msb; import org.onap.cli.fw.OnapCommandSchema; import org.onap.cli.fw.cmd.OnapHttpCommand; -@OnapCommandSchema(name = "microservice-delete", schema = "microservice-delete-schema.yaml") +@OnapCommandSchema(name = "microservice-delete", version = "onap-1.0", schema = "microservice-delete-schema.yaml") public class OnapServiceDeleteCommand extends OnapHttpCommand { } diff --git a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java index 436d187b..fadbf020 100644 --- a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java +++ b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java @@ -19,6 +19,6 @@ package org.onap.cli.cmd.cs.msb; import org.onap.cli.fw.OnapCommandSchema; import org.onap.cli.fw.cmd.OnapHttpCommand; -@OnapCommandSchema(name = "microservice-list", schema = "microservice-list-schema.yaml") +@OnapCommandSchema(name = "microservice-list", version = "onap-1.0", schema = "microservice-list-schema.yaml") public class OnapServiceListCommand extends OnapHttpCommand { } diff --git a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java index 2256cc61..bef3af9b 100644 --- a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java +++ b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java @@ -19,6 +19,6 @@ package org.onap.cli.cmd.cs.msb; import org.onap.cli.fw.OnapCommandSchema; import org.onap.cli.fw.cmd.OnapHttpCommand; -@OnapCommandSchema(name = "microservice-show", schema = "microservice-show-schema.yaml") +@OnapCommandSchema(name = "microservice-show", version = "onap-1.0", schema = "microservice-show-schema.yaml") public class OnapServiceShowCommand extends OnapHttpCommand { } diff --git a/plugins/msb/src/main/resources/microservice-create-schema.yaml b/plugins/msb/src/main/resources/microservice-create-schema.yaml deleted file mode 100644 index 13bd53b1..00000000 --- a/plugins/msb/src/main/resources/microservice-create-schema.yaml +++ /dev/null @@ -1,85 +0,0 @@ -onap_cmd_schema_version: 1.0 -name: microservice-create -description: Register microservice into Onap -service: - name: msb - version: v1 - -parameters: - - name: service-name - description: Onap service name - type: string - short_option: x - long_option: service-name - is_optional: false - - name: service-version - description: Onap service version - type: string - short_option: y - long_option: service-version - is_optional: false - - name: service-url - description: Onap service base url - type: url - short_option: r - long_option: service-url - is_optional: false - - name: node-ip - description: Onap service running node IP - type: string - - name: node-port - description: Onap service running node port - type: string - - name: create-or-update - description: Onap service create or update - type: bool - default_value: true -results: - direction: portrait - attributes: - - name: name - description: Onap service name - scope: short - type: string - - name: version - description: Onap service version - scope: short - type: string - - name: url - description: Onap service base url - scope: short - type: url - - name: status - description: Onap service status - scope: short - type: long - - name: nodes - description: Onap service running nodes - scope: long - type: string - - name: location - description: Onap service location - scope: long - type: url -http: - request: - uri: /services - method: POST - body: '{"serviceName":"${service-name}","version":"${service-version}","url":"${service-url}","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"${node-ip}","port":"${node-port}","ttl":0}]}' - headers: - queries: - createOrUpdate: ${create-or-update} - success_codes: - - 201 - - 200 - result_map: - name: $b{$.serviceName} - version: $b{$.version} - url: $b{$.url} - status: $b{$.status} - nodes: $b{$.nodes[*].ip}:$b{$.nodes[*].port} - location: $h{Location} - - sample_response: - body: '{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}' - diff --git a/plugins/msb/src/main/resources/microservice-delete-schema.yaml b/plugins/msb/src/main/resources/microservice-delete-schema.yaml deleted file mode 100644 index 695efe1e..00000000 --- a/plugins/msb/src/main/resources/microservice-delete-schema.yaml +++ /dev/null @@ -1,31 +0,0 @@ -onap_cmd_schema_version: 1.0 -name: microservice-delete -description: Deletes the micro service from Onap -service: - name: msb - version: v1 - -parameters: - - name: service-name - description: Onap service name - type: string - short_option: x - long_option: service-name - is_optional: false - - name: service-version - description: Onap service version - type: string - short_option: y - long_option: service-version - is_optional: false -http: - request: - uri: /services/${service-name}/version/${service-version} - method: DELETE - success_codes: - - 201 - - 200 - - 204 - - - diff --git a/plugins/msb/src/main/resources/microservice-list-schema.yaml b/plugins/msb/src/main/resources/microservice-list-schema.yaml deleted file mode 100644 index 42fa0ec4..00000000 --- a/plugins/msb/src/main/resources/microservice-list-schema.yaml +++ /dev/null @@ -1,49 +0,0 @@ -onap_cmd_schema_version: 1.0 -name: microservice-list -description: Lists the registetred micro services in Onap -service: - name: msb - version: v1 - auth: none -results: - direction: landscape - attributes: - - name: name - description: Onap service name - scope: short - type: string - - name: version - description: Onap service version - scope: short - type: string - - name: url - description: Onap service base url - scope: short - type: url - - name: status - description: Onap service status - scope: short - type: long - - name: nodes - description: Onap service running nodes - scope: long - type: json -http: - request: - uri: /services - method: GET - success_codes: - - 201 - - 200 - result_map: - name: $b{$.[*].serviceName} - version: $b{$.[*].version} - url: $b{$.[*].url} - status: $b{$.[*].status} - nodes: $b{$.[*].nodes[*].ip}:$b{$.[*].nodes[*].port} - sample_response: - body: '[{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}]' - - - - diff --git a/plugins/msb/src/main/resources/microservice-show-schema.yaml b/plugins/msb/src/main/resources/microservice-show-schema.yaml deleted file mode 100644 index 26cccfd3..00000000 --- a/plugins/msb/src/main/resources/microservice-show-schema.yaml +++ /dev/null @@ -1,62 +0,0 @@ -onap_cmd_schema_version: 1.0 -name: microservice-show -description: Details the registered microservice in Onap -service: - name: msb - version: v1 - auth: none -parameters: - - name: service-name - description: Onap service name - type: string - short_option: x - long_option: service-name - is_optional: false - - name: service-version - description: Onap service version - type: string - short_option: y - long_option: service-version - is_optional: false -results: - direction: landscape - attributes: - - name: name - description: Onap service name - scope: short - type: string - - name: version - description: Onap service version - scope: short - type: string - - name: url - description: Onap service base url - scope: short - type: url - - name: status - description: Onap service status - scope: short - type: long - - name: nodes - description: Onap service running nodes - scope: long - type: json -http: - request: - uri: /services/${service-name}/version/${service-version} - method: GET - success_codes: - - 201 - - 200 - result_map: - name: $b{$.serviceName} - version: $b{$.version} - url: $b{$.url} - status: $b{$.status} - nodes: $b{$.nodes[*].ip}:$b{$.nodes[*].port} - sample_response: - body: '{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}' - - - - diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml new file mode 100644 index 00000000..71f068c1 --- /dev/null +++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml @@ -0,0 +1,86 @@ +onap_cmd_schema_version: 1.0 +name: microservice-create +description: Register microservice into Onap +version: onap-1.0 +service: + name: msb + version: v1 + +parameters: + - name: service-name + description: Onap service name + type: string + short_option: x + long_option: service-name + is_optional: false + - name: service-version + description: Onap service version + type: string + short_option: y + long_option: service-version + is_optional: false + - name: service-url + description: Onap service base url + type: url + short_option: r + long_option: service-url + is_optional: false + - name: node-ip + description: Onap service running node IP + type: string + - name: node-port + description: Onap service running node port + type: string + - name: create-or-update + description: Onap service create or update + type: bool + default_value: true +results: + direction: portrait + attributes: + - name: name + description: Onap service name + scope: short + type: string + - name: version + description: Onap service version + scope: short + type: string + - name: url + description: Onap service base url + scope: short + type: url + - name: status + description: Onap service status + scope: short + type: long + - name: nodes + description: Onap service running nodes + scope: long + type: string + - name: location + description: Onap service location + scope: long + type: url +http: + request: + uri: /services + method: POST + body: '{"serviceName":"${service-name}","version":"${service-version}","url":"${service-url}","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"${node-ip}","port":"${node-port}","ttl":0}]}' + headers: + queries: + createOrUpdate: ${create-or-update} + success_codes: + - 201 + - 200 + result_map: + name: $b{$.serviceName} + version: $b{$.version} + url: $b{$.url} + status: $b{$.status} + nodes: $b{$.nodes[*].ip}:$b{$.nodes[*].port} + location: $h{Location} + + sample_response: + body: '{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}' + diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml new file mode 100644 index 00000000..af92172f --- /dev/null +++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml @@ -0,0 +1,32 @@ +onap_cmd_schema_version: 1.0 +name: microservice-delete +description: Deletes the micro service from Onap +version: onap-1.0 +service: + name: msb + version: v1 + +parameters: + - name: service-name + description: Onap service name + type: string + short_option: x + long_option: service-name + is_optional: false + - name: service-version + description: Onap service version + type: string + short_option: y + long_option: service-version + is_optional: false +http: + request: + uri: /services/${service-name}/version/${service-version} + method: DELETE + success_codes: + - 201 + - 200 + - 204 + + + diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml new file mode 100644 index 00000000..1688ef24 --- /dev/null +++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml @@ -0,0 +1,50 @@ +onap_cmd_schema_version: 1.0 +name: microservice-list +description: Lists the registetred micro services in Onap +version: onap-1.0 +service: + name: msb + version: v1 + auth: none +results: + direction: landscape + attributes: + - name: name + description: Onap service name + scope: short + type: string + - name: version + description: Onap service version + scope: short + type: string + - name: url + description: Onap service base url + scope: short + type: url + - name: status + description: Onap service status + scope: short + type: long + - name: nodes + description: Onap service running nodes + scope: long + type: json +http: + request: + uri: /services + method: GET + success_codes: + - 201 + - 200 + result_map: + name: $b{$.[*].serviceName} + version: $b{$.[*].version} + url: $b{$.[*].url} + status: $b{$.[*].status} + nodes: $b{$.[*].nodes[*].ip}:$b{$.[*].nodes[*].port} + sample_response: + body: '[{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}]' + + + + diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml new file mode 100644 index 00000000..3173b779 --- /dev/null +++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml @@ -0,0 +1,63 @@ +onap_cmd_schema_version: 1.0 +name: microservice-show +description: Details the registered microservice in Onap +version: onap-1.0 +service: + name: msb + version: v1 + auth: none +parameters: + - name: service-name + description: Onap service name + type: string + short_option: x + long_option: service-name + is_optional: false + - name: service-version + description: Onap service version + type: string + short_option: y + long_option: service-version + is_optional: false +results: + direction: landscape + attributes: + - name: name + description: Onap service name + scope: short + type: string + - name: version + description: Onap service version + scope: short + type: string + - name: url + description: Onap service base url + scope: short + type: url + - name: status + description: Onap service status + scope: short + type: long + - name: nodes + description: Onap service running nodes + scope: long + type: json +http: + request: + uri: /services/${service-name}/version/${service-version} + method: GET + success_codes: + - 201 + - 200 + result_map: + name: $b{$.serviceName} + version: $b{$.version} + url: $b{$.url} + status: $b{$.status} + nodes: $b{$.nodes[*].ip}:$b{$.nodes[*].port} + sample_response: + body: '{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}' + + + + diff --git a/plugins/msb/src/test/resources/service-list-schema.yaml b/plugins/msb/src/test/resources/service-list-schema.yaml index 72e774b8..f7a45a3c 100644 --- a/plugins/msb/src/test/resources/service-list-schema.yaml +++ b/plugins/msb/src/test/resources/service-list-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: service-list description: Onap Service list +version: onap-1.0 service: name: msb version: v1 diff --git a/plugins/msb/src/test/resources/user-create-schema.yaml b/plugins/msb/src/test/resources/user-create-schema.yaml index 3f1e8866..08bbd5b6 100644 --- a/plugins/msb/src/test/resources/user-create-schema.yaml +++ b/plugins/msb/src/test/resources/user-create-schema.yaml @@ -1,6 +1,7 @@ onap_cmd_schema_version: 1.0 name: user-create description: Onap user create command. +version: onap-1.0 service: name: auth version: v1 diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema.yaml index a845deb5..4bd8b1f4 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema.yaml @@ -1,7 +1,7 @@ onap_cmd_schema_version: 1.0 name: vsp-checkin description: Checkin Vendor Software Product - +version: onap-1.0 service: name: sdc version: v1.0 diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml index 6f460884..f090b035 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema.yaml @@ -1,7 +1,7 @@ onap_cmd_schema_version: 1.0 name: vsp-create description: Create Vendor Software Product - +version: onap-1.0 service: name: sdc version: v1.0 diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema.yaml index 9fe2564e..1055f297 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema.yaml @@ -1,7 +1,7 @@ onap_cmd_schema_version: 1.0 name: vsp-list description: List of the Vendor Software Products - +version: onap-1.0 service: name: sdc version: v1.0 diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema.yaml index 0f400b74..83e11139 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema.yaml @@ -1,7 +1,7 @@ onap_cmd_schema_version: 1.0 name: vsp-show description: Details of the Vendor Software Product - +version: onap-1.0 service: name: sdc version: v1.0 diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema.yaml index 95572939..631e204d 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema.yaml @@ -1,7 +1,7 @@ onap_cmd_schema_version: 1.0 name: vsp-submit description: Submit Vendor Software Product - +version: onap-1.0 service: name: sdc version: v1.0 diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-upload-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-upload-schema.yaml index bc0bc4c7..5786531c 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-upload-schema.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-upload-schema.yaml @@ -1,7 +1,7 @@ onap_cmd_schema_version: 1.0 name: vsp-upload description: Upload the CSAR file to VSP - +version: onap-1.0 service: name: sdc version: v1.0 diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-sample.yaml index 6e3263e3..c5d64917 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-checkin-sample.yaml @@ -1,7 +1,7 @@ onap_cli_sample_version: 1.0 name: vsp-checkin - +version: onap-1.0 samples: sample1: name: Checkin the Vendor Software Product diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-sample.yaml index c261899d..c96a76fd 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-create-sample.yaml @@ -1,7 +1,7 @@ onap_cli_sample_version: 1.0 name: vsp-create - +version: onap-1.0 samples: sample1: name: Create the Vendor Software Product diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-sample.yaml index 82013df6..4cfa64af 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-sample.yaml @@ -1,7 +1,7 @@ onap_cli_sample_version: 1.0 name: vsp-list - +version: onap-1.0 samples: sample1: name: List Vendor Software Products diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-sample.yaml index f599b747..4938c0cb 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-show-sample.yaml @@ -1,7 +1,7 @@ onap_cli_sample_version: 1.0 name: vsp-show - +version: onap-1.0 samples: sample1: name: Show the details of Vendor Software Products diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-sample.yaml index 19f3d7d0..568fdf72 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-submit-sample.yaml @@ -1,7 +1,7 @@ onap_cli_sample_version: 1.0 name: vsp-submit - +version: onap-1.0 samples: sample1: name: Submit the Vendor Software Product diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-sample.yaml index 7fecc8a0..1fd10340 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-upload-sample.yaml @@ -1,7 +1,7 @@ onap_cli_sample_version: 1.0 name: vsp-upload - +version: onap-1.0 samples: sample1: name: upload the zip file to Vendor Software Product -- cgit