From a52f00e9d0af1181d3e9c87508789fb4ced022f5 Mon Sep 17 00:00:00 2001 From: Itohan Date: Mon, 30 Sep 2019 23:39:44 +0000 Subject: Minor bug fixes in CLI - Added USER_ID header for SDC - Changed multicloud url - Added samples for commands - Fixed Bug in service-create command Signed-off-by: Itohan Ukponmwan Issue-ID: CLI-229 Change-Id: I9ec94d6dd390d2b5bf059c2f8a82c67b65fbeb34 --- .../customer-create-schema-elalto-moco.json | 22 +++++ .../customer-create-schema-elalto-sample.yaml | 9 ++ .../owning-entity-list-schema-elalto-moco.json | 99 ++++++++++++++++++++++ .../owning-entity-list-schema-elalto-sample.yaml | 14 +++ .../service-type-create-schema-elalto-moco.json | 21 +++++ .../service-type-create-schema-elalto-sample.yaml | 9 ++ .../subscription-cloud-add-schema-elalto-moco.json | 36 ++++++++ ...ubscription-cloud-add-schema-elalto-sample.yaml | 9 ++ .../subscription-create-schema-elalto-moco.json | 41 +++++++++ .../subscription-create-schema-elalto-sample.yaml | 9 ++ 10 files changed, 269 insertions(+) create mode 100644 products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-elalto-moco.json create mode 100644 products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-elalto-sample.yaml create mode 100644 products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/owning-entity/owning-entity-list-schema-elalto-moco.json create mode 100644 products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/owning-entity/owning-entity-list-schema-elalto-sample.yaml create mode 100644 products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-elalto-moco.json create mode 100644 products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-elalto-sample.yaml create mode 100644 products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-cloud-add-schema-elalto-moco.json create mode 100644 products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-cloud-add-schema-elalto-sample.yaml create mode 100644 products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-elalto-moco.json create mode 100644 products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-elalto-sample.yaml (limited to 'products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business') diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-elalto-moco.json b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-elalto-moco.json new file mode 100644 index 00000000..bd3ee43e --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-elalto-moco.json @@ -0,0 +1,22 @@ +[ { + "request" : { + "method" : "put", + "uri" : "/aai/v16/business/customers/customer/hpa_cust", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-d90d62b3-f976-44a8-9b51-d18096eba60b", + "Content-Type" : "application/json" + }, + "json" : { + "global-customer-id" : "hpa_cust", + "subscriber-name" : "hpa_cust", + "subscriber-type" : "INFRA" + } + }, + "response" : { + "status" : 201, + "json" : null + } +} ] \ No newline at end of file diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-elalto-sample.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-elalto-sample.yaml new file mode 100644 index 00000000..effbfe2b --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-elalto-sample.yaml @@ -0,0 +1,9 @@ +open_cli_sample_version: 1.0 +name: customer-create +version: onap-elalto +samples: + sample1: + name: customer-create + input: -x hpa_cust -y hpa_cust -m https://10.12.5.110:30233 -u AAI -p AAI + moco: customer-create-schema-elalto-moco.json + output: \ No newline at end of file diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/owning-entity/owning-entity-list-schema-elalto-moco.json b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/owning-entity/owning-entity-list-schema-elalto-moco.json new file mode 100644 index 00000000..dce3740f --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/owning-entity/owning-entity-list-schema-elalto-moco.json @@ -0,0 +1,99 @@ +[ { + "request" : { + "method" : "get", + "uri" : "/aai/v16/business/owning-entities", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-56d054e7-c86e-4427-afa3-0f40e06c90c5", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 200, + "json" : { + "owning-entity" : [ { + "owning-entity-id" : "98d5c337-ccd0-49d7-87b6-14b9a33d4c8a", + "owning-entity-name" : "OE-Demonstration", + "resource-version" : "1569883244791", + "relationship-list" : { + "relationship" : [ { + "related-to" : "service-instance", + "relationship-label" : "org.onap.relationships.inventory.BelongsTo", + "related-link" : "/aai/v16/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/df5fb9f7-4286-4a27-a395-21230bcde88f", + "relationship-data" : [ { + "relationship-key" : "customer.global-customer-id", + "relationship-value" : "Demonstration" + }, { + "relationship-key" : "service-subscription.service-type", + "relationship-value" : "vFW" + }, { + "relationship-key" : "service-instance.service-instance-id", + "relationship-value" : "df5fb9f7-4286-4a27-a395-21230bcde88f" + } ], + "related-to-property" : [ { + "property-key" : "service-instance.service-instance-name", + "property-value" : "vfwk8s_service" + } ] + }, { + "related-to" : "service-instance", + "relationship-label" : "org.onap.relationships.inventory.BelongsTo", + "related-link" : "/aai/v16/business/customers/customer/hpa_cust/service-subscriptions/service-subscription/vFW/service-instances/service-instance/c094df15-a513-4f4f-8e6b-f2850788490f", + "relationship-data" : [ { + "relationship-key" : "customer.global-customer-id", + "relationship-value" : "hpa_cust" + }, { + "relationship-key" : "service-subscription.service-type", + "relationship-value" : "vFW" + }, { + "relationship-key" : "service-instance.service-instance-id", + "relationship-value" : "c094df15-a513-4f4f-8e6b-f2850788490f" + } ], + "related-to-property" : [ { + "property-key" : "service-instance.service-instance-name", + "property-value" : "test" + } ] + }, { + "related-to" : "service-instance", + "relationship-label" : "org.onap.relationships.inventory.BelongsTo", + "related-link" : "/aai/v16/business/customers/customer/hpa_cust/service-subscriptions/service-subscription/vFW/service-instances/service-instance/24ed4142-2ef3-40b0-9ffb-d1a86a635019", + "relationship-data" : [ { + "relationship-key" : "customer.global-customer-id", + "relationship-value" : "hpa_cust" + }, { + "relationship-key" : "service-subscription.service-type", + "relationship-value" : "vFW" + }, { + "relationship-key" : "service-instance.service-instance-id", + "relationship-value" : "24ed4142-2ef3-40b0-9ffb-d1a86a635019" + } ], + "related-to-property" : [ { + "property-key" : "service-instance.service-instance-name", + "property-value" : "test-2" + } ] + }, { + "related-to" : "service-instance", + "relationship-label" : "org.onap.relationships.inventory.BelongsTo", + "related-link" : "/aai/v16/business/customers/customer/hpa_cust/service-subscriptions/service-subscription/vFW/service-instances/service-instance/43f872fa-20b7-4fd8-9076-61fb4b844cf4", + "relationship-data" : [ { + "relationship-key" : "customer.global-customer-id", + "relationship-value" : "hpa_cust" + }, { + "relationship-key" : "service-subscription.service-type", + "relationship-value" : "vFW" + }, { + "relationship-key" : "service-instance.service-instance-id", + "relationship-value" : "43f872fa-20b7-4fd8-9076-61fb4b844cf4" + } ], + "related-to-property" : [ { + "property-key" : "service-instance.service-instance-name", + "property-value" : "test-3" + } ] + } ] + } + } ] + } + } +} ] \ No newline at end of file diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/owning-entity/owning-entity-list-schema-elalto-sample.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/owning-entity/owning-entity-list-schema-elalto-sample.yaml new file mode 100644 index 00000000..1f6faed8 --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/owning-entity/owning-entity-list-schema-elalto-sample.yaml @@ -0,0 +1,14 @@ +open_cli_sample_version: 1.0 +name: owning-entity-list +version: onap-elalto +samples: + sample1: + name: owning-entity-list + input: -u AAI -p AAI -m https://10.12.5.110:30233 + moco: owning-entity-list-schema-elalto-moco.json + output: | + +------------------+--------------------------------------+------------------+ + |name |Id |resource-version | + +------------------+--------------------------------------+------------------+ + |OE-Demonstration |98d5c337-ccd0-49d7-87b6-14b9a33d4c8a |1569883244791 | + +------------------+--------------------------------------+------------------+ diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-elalto-moco.json b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-elalto-moco.json new file mode 100644 index 00000000..31a4e080 --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-elalto-moco.json @@ -0,0 +1,21 @@ +[ { + "request" : { + "method" : "put", + "uri" : "/aai/v13/service-design-and-creation/services/service/da43d94a-cd5f-4709-8c1b-593d7a3939c2", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-a49f56ef-61c6-4768-ae63-64742594a0bd", + "Content-Type" : "application/json" + }, + "json" : { + "service-description" : "vFW", + "service-id" : "da43d94a-cd5f-4709-8c1b-593d7a3939c2" + } + }, + "response" : { + "status" : 201, + "json" : null + } +} ] \ No newline at end of file diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-elalto-sample.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-elalto-sample.yaml new file mode 100644 index 00000000..0d20c762 --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-elalto-sample.yaml @@ -0,0 +1,9 @@ +open_cli_sample_version: 1.0 +name: service-type-create +version: onap-elalto +samples: + sample1: + name: service-type-create + input: -x vFW -m https://10.12.5.110:30233 -u AAI -p AAI + moco: service-type-create-schema-elalto-moco.json + output: \ No newline at end of file diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-cloud-add-schema-elalto-moco.json b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-cloud-add-schema-elalto-moco.json new file mode 100644 index 00000000..d6fc283f --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-cloud-add-schema-elalto-moco.json @@ -0,0 +1,36 @@ +[ { + "request" : { + "method" : "put", + "uri" : "/aai/v16/business/customers/customer/hpa_cust/service-subscriptions/service-subscription/vFW/relationship-list/relationship", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-303c73eb-e36b-4287-b6eb-563cb0dc7837", + "Content-Type" : "application/json" + }, + "json" : { + "related-to" : "tenant", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/ONAP-POD-01-Rail-05/tenants/tenant/709ba629fe194f8699b12f9d6ffd86a0", + "relationship-data" : [ { + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "CloudOwner" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "ONAP-POD-01-Rail-05" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "709ba629fe194f8699b12f9d6ffd86a0" + } ], + "related-to-property" : [ { + "property-key" : "tenant.tenant-name", + "property-value" : "Integration-HPA" + } ] + } + }, + "response" : { + "status" : 200, + "json" : null + } +} ] \ No newline at end of file diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-cloud-add-schema-elalto-sample.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-cloud-add-schema-elalto-sample.yaml new file mode 100644 index 00000000..8d15c453 --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-cloud-add-schema-elalto-sample.yaml @@ -0,0 +1,9 @@ +open_cli_sample_version: 1.0 +name: subscription-cloud-add +version: onap-elalto +samples: + sample1: + name: subscription-cloud-add + input: -x hpa_cust -c 709ba629fe194f8699b12f9d6ffd86a0 -z CloudOwner -e vFW -y Integration-HPA -r ONAP-POD-01-Rail-05 -m https://10.12.5.110:30233 -u AAI -p AAI + moco: subscription-cloud-add-schema-elalto-moco.json + output: \ No newline at end of file diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-elalto-moco.json b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-elalto-moco.json new file mode 100644 index 00000000..74ebb0e8 --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-elalto-moco.json @@ -0,0 +1,41 @@ +[ { + "request" : { + "method" : "put", + "uri" : "/aai/v16/business/customers/customer/hpa_cust/service-subscriptions/service-subscription/vFW", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-4dcf0fb2-4cb7-4045-8b3e-3234c799668b", + "Content-Type" : "application/json" + }, + "json" : { + "service-type" : "vFW", + "relationship-list" : { + "relationship" : [ { + "related-to" : "tenant", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/ONAP-POD-01-Rail-07/tenants/tenant/709ba629fe194f8699b12f9d6ffd86a0", + "relationship-data" : [ { + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "CloudOwner" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "ONAP-POD-01-Rail-07" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "709ba629fe194f8699b12f9d6ffd86a0" + } ], + "related-to-property" : [ { + "property-key" : "tenant.tenant-name", + "property-value" : "Integration-HPA" + } ] + } ] + } + } + }, + "response" : { + "status" : 201, + "json" : null + } +} ] \ No newline at end of file diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-elalto-sample.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-elalto-sample.yaml new file mode 100644 index 00000000..da4a777e --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-elalto-sample.yaml @@ -0,0 +1,9 @@ +open_cli_sample_version: 1.0 +name: subscription-create +version: onap-elalto +samples: + sample1: + name: subscription-create + input: -x hpa_cust -c 709ba629fe194f8699b12f9d6ffd86a0 -z CloudOwner -e vFW -y Integration-HPA -r ONAP-POD-01-Rail-07 -m https://10.12.5.110:30233 -u AAI -p AAI + moco: subscription-create-schema-elalto-moco.json + output: \ No newline at end of file -- cgit 1.2.3-korg