From 952b99423d2e548527215a12450adb378f01a6c9 Mon Sep 17 00:00:00 2001 From: Itohan Date: Tue, 14 May 2019 23:07:54 +0000 Subject: Bug Fixes in ONAP CLI -Modified the service-instance-list vnf-list and vf-module-list commands to use AAI API instead of SO -Deleted Commands in SO Change-Id: If680711d056e7f50e074efb91bb2e352b8d735aa Issue-ID: CLI-163 Signed-off-by: Itohan Ukponmwan --- .../service-instance-list-schema-dublin-moco.json | 152 ++++++++ ...service-instance-list-schema-dublin-sample.yaml | 18 + .../vf-module-list-schema-dublin-moco.json | 77 ++++ .../vf-module-list-schema-dublin-sample.yaml | 14 + .../so-components/vnf-list-schema-dublin-moco.json | 419 +++++++++++++++++++++ .../vnf-list-schema-dublin-sample.yaml | 33 ++ .../service-instance-list-schema-dublin.yaml | 61 +++ .../vf-module-list-schema-dublin.yaml | 60 +++ .../so-components/vnf-list-schema-dublin.yaml | 93 +++++ .../service-list-schema-dublin.yaml | 83 ---- .../vf-module-list-schema-dublin.yaml | 143 ------- .../open-cli-schema/vnf-list-schema-dublin.yaml | 185 --------- 12 files changed, 927 insertions(+), 411 deletions(-) create mode 100644 products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-list-schema-dublin-moco.json create mode 100644 products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-list-schema-dublin-sample.yaml create mode 100644 products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-list-schema-dublin-moco.json create mode 100644 products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-list-schema-dublin-sample.yaml create mode 100644 products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-list-schema-dublin-moco.json create mode 100644 products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-list-schema-dublin-sample.yaml create mode 100644 products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-dublin.yaml create mode 100644 products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-schema-dublin.yaml create mode 100644 products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-list-schema-dublin.yaml delete mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-list-schema-dublin.yaml delete mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-list-schema-dublin.yaml delete mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-list-schema-dublin.yaml diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-list-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-list-schema-dublin-moco.json new file mode 100644 index 00000000..f3b16dfe --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-list-schema-dublin-moco.json @@ -0,0 +1,152 @@ +[ { + "request" : { + "method" : "get", + "uri" : "/aai/v14/nodes/service-instances/", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-0bee3e0a-fa8a-43b4-965c-a1e91fd0dd8b", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 200, + "json" : { + "service-instance" : [ { + "service-instance-id" : "11efdfa0-b4ef-43ac-901d-5f4195ad0c50", + "service-instance-name" : "vlb_si_ewm_1", + "environment-context" : "General_Revenue-Bearing", + "workload-context" : "Production", + "model-invariant-id" : "a1786c0b-c864-4202-a79d-babeb2af2924", + "model-version-id" : "1d71f3c1-863c-48ca-92ce-3c1cb6cc5a06", + "resource-version" : "1556780580114", + "orchestration-status" : "Active", + "relationship-list" : { + "relationship" : [ { + "related-to" : "project", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v14/business/projects/project/Project-Demonstration", + "relationship-data" : [ { + "relationship-key" : "project.project-name", + "relationship-value" : "Project-Demonstration" + } ] + }, { + "related-to" : "owning-entity", + "relationship-label" : "org.onap.relationships.inventory.BelongsTo", + "related-link" : "/aai/v14/business/owning-entities/owning-entity/35945688-7855-421e-a235-290e65b6eb13", + "relationship-data" : [ { + "relationship-key" : "owning-entity.owning-entity-id", + "relationship-value" : "35945688-7855-421e-a235-290e65b6eb13" + } ] + }, { + "related-to" : "generic-vnf", + "relationship-label" : "org.onap.relationships.inventory.ComposedOf", + "related-link" : "/aai/v14/network/generic-vnfs/generic-vnf/10cc4a6e-05d4-47de-94a3-f9e6fa88272e", + "relationship-data" : [ { + "relationship-key" : "generic-vnf.vnf-id", + "relationship-value" : "10cc4a6e-05d4-47de-94a3-f9e6fa88272e" + } ], + "related-to-property" : [ { + "property-key" : "generic-vnf.vnf-name", + "property-value" : "vlb_vnf_ewm_1" + } ] + } ] + } + }, { + "service-instance-id" : "1a221a01-1f49-475c-90c1-bcc161bf3046", + "service-instance-name" : "test-instance", + "environment-context" : "General_Revenue-Bearing", + "workload-context" : "Production", + "model-invariant-id" : "db2affd2-28b5-486f-9193-70698675e6fb", + "model-version-id" : "a4c5c1ef-6d78-4fd3-907d-bfe51d0e5bda", + "resource-version" : "1557173769891", + "orchestration-status" : "Active", + "relationship-list" : { + "relationship" : [ { + "related-to" : "project", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v14/business/projects/project/Project-Demonstration", + "relationship-data" : [ { + "relationship-key" : "project.project-name", + "relationship-value" : "Project-Demonstration" + } ] + }, { + "related-to" : "owning-entity", + "relationship-label" : "org.onap.relationships.inventory.BelongsTo", + "related-link" : "/aai/v14/business/owning-entities/owning-entity/35945688-7855-421e-a235-290e65b6eb13", + "relationship-data" : [ { + "relationship-key" : "owning-entity.owning-entity-id", + "relationship-value" : "35945688-7855-421e-a235-290e65b6eb13" + } ] + }, { + "related-to" : "generic-vnf", + "relationship-label" : "org.onap.relationships.inventory.ComposedOf", + "related-link" : "/aai/v14/network/generic-vnfs/generic-vnf/082db047-3a89-4bf4-8236-63d6ad77cf2a", + "relationship-data" : [ { + "relationship-key" : "generic-vnf.vnf-id", + "relationship-value" : "082db047-3a89-4bf4-8236-63d6ad77cf2a" + } ], + "related-to-property" : [ { + "property-key" : "generic-vnf.vnf-name", + "property-value" : "vfw-hpa-vnf" + } ] + } ] + } + }, { + "service-instance-id" : "d1eec0a8-394a-4ac2-a315-24c324139fb6", + "service-instance-name" : "test", + "environment-context" : "General_Revenue-Bearing", + "workload-context" : "Production", + "model-invariant-id" : "cc7d51eb-d8c1-478d-a6b2-8aebd87ee682", + "model-version-id" : "411e4ce9-e316-4df1-a3d9-4a717d8aafdb", + "resource-version" : "1556906296686", + "orchestration-status" : "Active", + "relationship-list" : { + "relationship" : [ { + "related-to" : "project", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v14/business/projects/project/Project-Demonstration", + "relationship-data" : [ { + "relationship-key" : "project.project-name", + "relationship-value" : "Project-Demonstration" + } ] + }, { + "related-to" : "owning-entity", + "relationship-label" : "org.onap.relationships.inventory.BelongsTo", + "related-link" : "/aai/v14/business/owning-entities/owning-entity/35945688-7855-421e-a235-290e65b6eb13", + "relationship-data" : [ { + "relationship-key" : "owning-entity.owning-entity-id", + "relationship-value" : "35945688-7855-421e-a235-290e65b6eb13" + } ] + }, { + "related-to" : "generic-vnf", + "relationship-label" : "org.onap.relationships.inventory.ComposedOf", + "related-link" : "/aai/v14/network/generic-vnfs/generic-vnf/ab0516f2-c8ba-4a2e-8d6e-f6d7a4cd89a0", + "relationship-data" : [ { + "relationship-key" : "generic-vnf.vnf-id", + "relationship-value" : "ab0516f2-c8ba-4a2e-8d6e-f6d7a4cd89a0" + } ], + "related-to-property" : [ { + "property-key" : "generic-vnf.vnf-name", + "property-value" : "vfw-hpa-vnf" + } ] + }, { + "related-to" : "generic-vnf", + "relationship-label" : "org.onap.relationships.inventory.ComposedOf", + "related-link" : "/aai/v14/network/generic-vnfs/generic-vnf/6ed28cda-43ba-49b6-8237-78d6c19acbc7", + "relationship-data" : [ { + "relationship-key" : "generic-vnf.vnf-id", + "relationship-value" : "6ed28cda-43ba-49b6-8237-78d6c19acbc7" + } ], + "related-to-property" : [ { + "property-key" : "generic-vnf.vnf-name", + "property-value" : "vnf-2" + } ] + } ] + } + } ] + } + } +} ] \ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-list-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-list-schema-dublin-sample.yaml new file mode 100644 index 00000000..7099a451 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-list-schema-dublin-sample.yaml @@ -0,0 +1,18 @@ +open_cli_sample_version: 1.0 +name: -u +version: onap-dublin +samples: + sample1: + name: -u + input: AAI -p AAI -m https://10.12.7.6:30233 + moco: service-instance-list-schema-dublin-moco.json + output: | + +------------------------+--------------------------------------+------------------+--------------------------------------+--------------------------------------+ + |service-instance-name |service-instance-id |resource-version |service-model-version-id |service-model-invariant-id | + +------------------------+--------------------------------------+------------------+--------------------------------------+--------------------------------------+ + |vlb_si_ewm_1 |11efdfa0-b4ef-43ac-901d-5f4195ad0c50 |1556780580114 |1d71f3c1-863c-48ca-92ce-3c1cb6cc5a06 |a1786c0b-c864-4202-a79d-babeb2af2924 | + +------------------------+--------------------------------------+------------------+--------------------------------------+--------------------------------------+ + |test-instance |1a221a01-1f49-475c-90c1-bcc161bf3046 |1557173769891 |a4c5c1ef-6d78-4fd3-907d-bfe51d0e5bda |db2affd2-28b5-486f-9193-70698675e6fb | + +------------------------+--------------------------------------+------------------+--------------------------------------+--------------------------------------+ + |test |d1eec0a8-394a-4ac2-a315-24c324139fb6 |1556906296686 |411e4ce9-e316-4df1-a3d9-4a717d8aafdb |cc7d51eb-d8c1-478d-a6b2-8aebd87ee682 | + +------------------------+--------------------------------------+------------------+--------------------------------------+--------------------------------------+ diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-list-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-list-schema-dublin-moco.json new file mode 100644 index 00000000..0842a24c --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-list-schema-dublin-moco.json @@ -0,0 +1,77 @@ +[ { + "request" : { + "method" : "get", + "uri" : "/aai/v14/network/generic-vnfs/generic-vnf/822103de-eef7-4dbb-a903-ee63d1d6c828/vf-modules", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-bafcc585-f462-44a4-b17e-a1d78e330fc2", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 200, + "json" : { + "vf-module" : [ { + "vf-module-id" : "92c1841f-d53b-4fb8-ab6a-28e3cba57732", + "vf-module-name" : "Vfmodule_Ete_vFWDTvFWSNK_97f314d9_2", + "heat-stack-id" : "Vfmodule_Ete_vFWDTvFWSNK_97f314d9_2/5bd73ba3-bc2c-4aa9-b2a8-a0b2040d9cbf", + "orchestration-status" : "active", + "is-base-vf-module" : true, + "automated-assignment" : false, + "resource-version" : "1557871047301", + "model-invariant-id" : "87c70139-91bd-4f2d-abba-527140526a13", + "model-version-id" : "4364c106-8031-4d9d-9c23-a47471b929a8", + "model-customization-id" : "6cf93ce9-c0d2-4a56-8df1-80942f83de60", + "module-index" : 0, + "relationship-list" : { + "relationship" : [ { + "related-to" : "vserver", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/09d8566ea45e43aa974cf447ed591d77/vservers/vserver/67c0297b-a520-4dee-9c95-a2b98e27b397", + "relationship-data" : [ { + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "CloudOwner" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "RegionOne" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "09d8566ea45e43aa974cf447ed591d77" + }, { + "relationship-key" : "vserver.vserver-id", + "relationship-value" : "67c0297b-a520-4dee-9c95-a2b98e27b397" + } ], + "related-to-property" : [ { + "property-key" : "vserver.vserver-name", + "property-value" : "vofwl01snk14d9" + } ] + }, { + "related-to" : "vserver", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/09d8566ea45e43aa974cf447ed591d77/vservers/vserver/d5a477eb-6241-47d9-9ca0-a692940c048e", + "relationship-data" : [ { + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "CloudOwner" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "RegionOne" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "09d8566ea45e43aa974cf447ed591d77" + }, { + "relationship-key" : "vserver.vserver-id", + "relationship-value" : "d5a477eb-6241-47d9-9ca0-a692940c048e" + } ], + "related-to-property" : [ { + "property-key" : "vserver.vserver-name", + "property-value" : "vofwl01vfw14d9" + } ] + } ] + } + } ] + } + } +} ] \ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-list-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-list-schema-dublin-sample.yaml new file mode 100644 index 00000000..4fdc9ca3 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-list-schema-dublin-sample.yaml @@ -0,0 +1,14 @@ +open_cli_sample_version: 1.0 +name: -x +version: onap-dublin +samples: + sample1: + name: -x + input: 822103de-eef7-4dbb-a903-ee63d1d6c828 -u AAI -p AAI -m https://10.12.6.48:30233 -s + moco: vf-module-list-schema-dublin-moco.json + output: | + +--------------------------------------+--------------------------------------+------------------+ + |vf-module-name |vf-module-id |resource-version | + +--------------------------------------+--------------------------------------+------------------+ + |Vfmodule_Ete_vFWDTvFWSNK_97f314d9_2 |92c1841f-d53b-4fb8-ab6a-28e3cba57732 |1557871047301 | + +--------------------------------------+--------------------------------------+------------------+ diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-list-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-list-schema-dublin-moco.json new file mode 100644 index 00000000..f9efa66c --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-list-schema-dublin-moco.json @@ -0,0 +1,419 @@ +[ { + "request" : { + "method" : "get", + "uri" : "/aai/v14/network/generic-vnfs/", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-4c90b45f-6bc5-4a36-82ca-56d5fba93537", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 200, + "json" : { + "generic-vnf" : [ { + "vnf-id" : "822103de-eef7-4dbb-a903-ee63d1d6c828", + "vnf-name" : "Ete_vFWDTvFWSNK_97f314d9_2", + "vnf-type" : "vFWDT 2019-05-14 21:39:/vFWDT_vFWSNK f6f516d5-df46 1", + "service-id" : "4ac68777-580d-4c77-be9e-715af194eff2", + "prov-status" : "ACTIVE", + "orchestration-status" : "Active", + "in-maint" : false, + "is-closed-loop-disabled" : false, + "resource-version" : "1557871053443", + "model-invariant-id" : "b4a756f2-abc3-4abb-ad72-bb1c74ead69b", + "model-version-id" : "9decac39-dc36-4d75-a163-4cac545962da", + "model-customization-id" : "3290f4d7-3067-4182-9882-a2874d24210e", + "relationship-list" : { + "relationship" : [ { + "related-to" : "service-instance", + "relationship-label" : "org.onap.relationships.inventory.ComposedOf", + "related-link" : "/aai/v14/business/customers/customer/DemoCust_97f314d9-ae80-4161-bc60-2263544dd5cf/service-subscriptions/service-subscription/vFWDT/service-instances/service-instance/70c30689-ed46-4ea9-8c9e-d3d4edd01c9a", + "relationship-data" : [ { + "relationship-key" : "customer.global-customer-id", + "relationship-value" : "DemoCust_97f314d9-ae80-4161-bc60-2263544dd5cf" + }, { + "relationship-key" : "service-subscription.service-type", + "relationship-value" : "vFWDT" + }, { + "relationship-key" : "service-instance.service-instance-id", + "relationship-value" : "70c30689-ed46-4ea9-8c9e-d3d4edd01c9a" + } ], + "related-to-property" : [ { + "property-key" : "service-instance.service-instance-name", + "property-value" : "Service_Ete_Name97f314d9-ae80-4161-bc60-2263544dd5cf" + } ] + }, { + "related-to" : "platform", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v14/business/platforms/platform/Platform-Demonstration", + "relationship-data" : [ { + "relationship-key" : "platform.platform-name", + "relationship-value" : "Platform-Demonstration" + } ] + }, { + "related-to" : "vserver", + "relationship-label" : "tosca.relationships.HostedOn", + "related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/09d8566ea45e43aa974cf447ed591d77/vservers/vserver/67c0297b-a520-4dee-9c95-a2b98e27b397", + "relationship-data" : [ { + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "CloudOwner" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "RegionOne" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "09d8566ea45e43aa974cf447ed591d77" + }, { + "relationship-key" : "vserver.vserver-id", + "relationship-value" : "67c0297b-a520-4dee-9c95-a2b98e27b397" + } ], + "related-to-property" : [ { + "property-key" : "vserver.vserver-name", + "property-value" : "vofwl01snk14d9" + } ] + }, { + "related-to" : "vserver", + "relationship-label" : "tosca.relationships.HostedOn", + "related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/09d8566ea45e43aa974cf447ed591d77/vservers/vserver/d5a477eb-6241-47d9-9ca0-a692940c048e", + "relationship-data" : [ { + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "CloudOwner" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "RegionOne" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "09d8566ea45e43aa974cf447ed591d77" + }, { + "relationship-key" : "vserver.vserver-id", + "relationship-value" : "d5a477eb-6241-47d9-9ca0-a692940c048e" + } ], + "related-to-property" : [ { + "property-key" : "vserver.vserver-name", + "property-value" : "vofwl01vfw14d9" + } ] + } ] + } + }, { + "vnf-id" : "52a4b034-828e-4a5c-9895-000aaf6cc05f", + "vnf-name" : "Ete_vFWCLvFWSNK_36e8ed23_0", + "vnf-type" : "vFWCL 2019-05-14 19:51:/vFWCL_vFWSNK 585f812d-2d8b 0", + "service-id" : "6ecb22b8-9198-4188-a81a-2926eaf3d413", + "prov-status" : "PREPROV", + "orchestration-status" : "Created", + "in-maint" : false, + "is-closed-loop-disabled" : false, + "resource-version" : "1557864105199", + "model-invariant-id" : "505c7e39-4355-4f6b-8add-38e28f13fbc5", + "model-version-id" : "d068ba61-84e3-47ee-837f-62740f59498e", + "model-customization-id" : "466da017-be2f-4764-a3ed-0a838597542b", + "relationship-list" : { + "relationship" : [ { + "related-to" : "service-instance", + "relationship-label" : "org.onap.relationships.inventory.ComposedOf", + "related-link" : "/aai/v14/business/customers/customer/DemoCust_36e8ed23-b928-4cea-ad8a-e9709e721ed8/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/aa521249-0c8d-4765-8d19-0335847c9c7f", + "relationship-data" : [ { + "relationship-key" : "customer.global-customer-id", + "relationship-value" : "DemoCust_36e8ed23-b928-4cea-ad8a-e9709e721ed8" + }, { + "relationship-key" : "service-subscription.service-type", + "relationship-value" : "vFWCL" + }, { + "relationship-key" : "service-instance.service-instance-id", + "relationship-value" : "aa521249-0c8d-4765-8d19-0335847c9c7f" + } ], + "related-to-property" : [ { + "property-key" : "service-instance.service-instance-name", + "property-value" : "Service_Ete_Name36e8ed23-b928-4cea-ad8a-e9709e721ed8" + } ] + }, { + "related-to" : "platform", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v14/business/platforms/platform/Platform-Demonstration", + "relationship-data" : [ { + "relationship-key" : "platform.platform-name", + "relationship-value" : "Platform-Demonstration" + } ] + } ] + } + }, { + "vnf-id" : "08e98ea9-e945-4ce2-b520-76ca11ff7c5f", + "vnf-name" : "Ete_vFWCLvFWSNK_d3e7a9ba_0", + "vnf-type" : "vFWCL 2019-05-14 19:35:/vFWCL_vFWSNK fd3acb2c-c0f5 0", + "service-id" : "6ecb22b8-9198-4188-a81a-2926eaf3d413", + "prov-status" : "PREPROV", + "orchestration-status" : "Created", + "in-maint" : false, + "is-closed-loop-disabled" : false, + "resource-version" : "1557863204408", + "model-invariant-id" : "24b21516-72dd-4569-a6c6-040b463de068", + "model-version-id" : "db870ede-6df9-4995-bbcb-aa579352043f", + "model-customization-id" : "9edda94c-e1db-43c9-82b9-651330b4f744", + "relationship-list" : { + "relationship" : [ { + "related-to" : "service-instance", + "relationship-label" : "org.onap.relationships.inventory.ComposedOf", + "related-link" : "/aai/v14/business/customers/customer/DemoCust_d3e7a9ba-d88a-43dc-9b0c-7999659f85d9/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/7e63e1d0-9a4d-456a-8870-ed7229b88fae", + "relationship-data" : [ { + "relationship-key" : "customer.global-customer-id", + "relationship-value" : "DemoCust_d3e7a9ba-d88a-43dc-9b0c-7999659f85d9" + }, { + "relationship-key" : "service-subscription.service-type", + "relationship-value" : "vFWCL" + }, { + "relationship-key" : "service-instance.service-instance-id", + "relationship-value" : "7e63e1d0-9a4d-456a-8870-ed7229b88fae" + } ], + "related-to-property" : [ { + "property-key" : "service-instance.service-instance-name", + "property-value" : "Service_Ete_Named3e7a9ba-d88a-43dc-9b0c-7999659f85d9" + } ] + }, { + "related-to" : "platform", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v14/business/platforms/platform/Platform-Demonstration", + "relationship-data" : [ { + "relationship-key" : "platform.platform-name", + "relationship-value" : "Platform-Demonstration" + } ] + } ] + } + }, { + "vnf-id" : "0957e4f3-109a-4937-898d-295f58ba2fc6", + "vnf-name" : "Ete_vFWDTvFWSNK_97f314d9_1", + "vnf-type" : "vFWDT 2019-05-14 21:39:/vFWDT_vFWSNK f6f516d5-df46 1", + "service-id" : "4ac68777-580d-4c77-be9e-715af194eff2", + "prov-status" : "ACTIVE", + "orchestration-status" : "Active", + "in-maint" : false, + "is-closed-loop-disabled" : false, + "resource-version" : "1557870869928", + "model-invariant-id" : "b4a756f2-abc3-4abb-ad72-bb1c74ead69b", + "model-version-id" : "9decac39-dc36-4d75-a163-4cac545962da", + "model-customization-id" : "3290f4d7-3067-4182-9882-a2874d24210e", + "relationship-list" : { + "relationship" : [ { + "related-to" : "service-instance", + "relationship-label" : "org.onap.relationships.inventory.ComposedOf", + "related-link" : "/aai/v14/business/customers/customer/DemoCust_97f314d9-ae80-4161-bc60-2263544dd5cf/service-subscriptions/service-subscription/vFWDT/service-instances/service-instance/70c30689-ed46-4ea9-8c9e-d3d4edd01c9a", + "relationship-data" : [ { + "relationship-key" : "customer.global-customer-id", + "relationship-value" : "DemoCust_97f314d9-ae80-4161-bc60-2263544dd5cf" + }, { + "relationship-key" : "service-subscription.service-type", + "relationship-value" : "vFWDT" + }, { + "relationship-key" : "service-instance.service-instance-id", + "relationship-value" : "70c30689-ed46-4ea9-8c9e-d3d4edd01c9a" + } ], + "related-to-property" : [ { + "property-key" : "service-instance.service-instance-name", + "property-value" : "Service_Ete_Name97f314d9-ae80-4161-bc60-2263544dd5cf" + } ] + }, { + "related-to" : "platform", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v14/business/platforms/platform/Platform-Demonstration", + "relationship-data" : [ { + "relationship-key" : "platform.platform-name", + "relationship-value" : "Platform-Demonstration" + } ] + }, { + "related-to" : "vserver", + "relationship-label" : "tosca.relationships.HostedOn", + "related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/09d8566ea45e43aa974cf447ed591d77/vservers/vserver/b77a17fe-11a5-4724-951a-7fb1dba9d667", + "relationship-data" : [ { + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "CloudOwner" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "RegionOne" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "09d8566ea45e43aa974cf447ed591d77" + }, { + "relationship-key" : "vserver.vserver-id", + "relationship-value" : "b77a17fe-11a5-4724-951a-7fb1dba9d667" + } ], + "related-to-property" : [ { + "property-key" : "vserver.vserver-name", + "property-value" : "vofwl01snk14d9" + } ] + }, { + "related-to" : "vserver", + "relationship-label" : "tosca.relationships.HostedOn", + "related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/09d8566ea45e43aa974cf447ed591d77/vservers/vserver/e41480f9-182c-42ad-bc5a-281b10d43229", + "relationship-data" : [ { + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "CloudOwner" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "RegionOne" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "09d8566ea45e43aa974cf447ed591d77" + }, { + "relationship-key" : "vserver.vserver-id", + "relationship-value" : "e41480f9-182c-42ad-bc5a-281b10d43229" + } ], + "related-to-property" : [ { + "property-key" : "vserver.vserver-name", + "property-value" : "vofwl01vfw14d9" + } ] + } ] + } + }, { + "vnf-id" : "3c44cd16-bb4b-407f-8b44-49cd4c53562e", + "vnf-name" : "Ete_vFWCLvFWSNK_d3e7a9ba_0", + "vnf-type" : "vFWCL 2019-05-14 19:35:/vFWCL_vFWSNK fd3acb2c-c0f5 0", + "service-id" : "6ecb22b8-9198-4188-a81a-2926eaf3d413", + "prov-status" : "PREPROV", + "orchestration-status" : "Created", + "in-maint" : false, + "is-closed-loop-disabled" : false, + "resource-version" : "1557863091272", + "model-invariant-id" : "24b21516-72dd-4569-a6c6-040b463de068", + "model-version-id" : "db870ede-6df9-4995-bbcb-aa579352043f", + "model-customization-id" : "9edda94c-e1db-43c9-82b9-651330b4f744", + "relationship-list" : { + "relationship" : [ { + "related-to" : "service-instance", + "relationship-label" : "org.onap.relationships.inventory.ComposedOf", + "related-link" : "/aai/v14/business/customers/customer/DemoCust_d3e7a9ba-d88a-43dc-9b0c-7999659f85d9/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/7e63e1d0-9a4d-456a-8870-ed7229b88fae", + "relationship-data" : [ { + "relationship-key" : "customer.global-customer-id", + "relationship-value" : "DemoCust_d3e7a9ba-d88a-43dc-9b0c-7999659f85d9" + }, { + "relationship-key" : "service-subscription.service-type", + "relationship-value" : "vFWCL" + }, { + "relationship-key" : "service-instance.service-instance-id", + "relationship-value" : "7e63e1d0-9a4d-456a-8870-ed7229b88fae" + } ], + "related-to-property" : [ { + "property-key" : "service-instance.service-instance-name", + "property-value" : "Service_Ete_Named3e7a9ba-d88a-43dc-9b0c-7999659f85d9" + } ] + }, { + "related-to" : "platform", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v14/business/platforms/platform/Platform-Demonstration", + "relationship-data" : [ { + "relationship-key" : "platform.platform-name", + "relationship-value" : "Platform-Demonstration" + } ] + } ] + } + }, { + "vnf-id" : "d6e21697-1195-4512-a44a-c9c914378eda", + "vnf-name" : "Ete_vFW_dc5d3d44_0", + "vnf-type" : "vFW 2019-05-14 21:11:13/vFW b709db2f-0039 0", + "service-id" : "b7fd205d-8c62-4701-9448-9dc55532d0e2", + "prov-status" : "PREPROV", + "orchestration-status" : "Created", + "in-maint" : false, + "is-closed-loop-disabled" : false, + "resource-version" : "1557868764828", + "model-invariant-id" : "f04950b2-765c-4c42-ac7c-cb05aacc4a26", + "model-version-id" : "6775ea75-1237-436c-a51a-b7dd1aa0f0df", + "model-customization-id" : "f222bbde-7d37-4f59-b00b-92125025d1ef", + "relationship-list" : { + "relationship" : [ { + "related-to" : "service-instance", + "relationship-label" : "org.onap.relationships.inventory.ComposedOf", + "related-link" : "/aai/v14/business/customers/customer/DemoCust_dc5d3d44-62ef-49ff-a8c9-c0108c68c456/service-subscriptions/service-subscription/vFW/service-instances/service-instance/b1928ef8-fd57-41db-a7f4-f3507efc44a4", + "relationship-data" : [ { + "relationship-key" : "customer.global-customer-id", + "relationship-value" : "DemoCust_dc5d3d44-62ef-49ff-a8c9-c0108c68c456" + }, { + "relationship-key" : "service-subscription.service-type", + "relationship-value" : "vFW" + }, { + "relationship-key" : "service-instance.service-instance-id", + "relationship-value" : "b1928ef8-fd57-41db-a7f4-f3507efc44a4" + } ], + "related-to-property" : [ { + "property-key" : "service-instance.service-instance-name", + "property-value" : "Service_Ete_Namedc5d3d44-62ef-49ff-a8c9-c0108c68c456" + } ] + }, { + "related-to" : "platform", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v14/business/platforms/platform/Platform-Demonstration", + "relationship-data" : [ { + "relationship-key" : "platform.platform-name", + "relationship-value" : "Platform-Demonstration" + } ] + } ] + } + }, { + "vnf-id" : "01d4ae85-04ca-4eb0-a636-76f690103067", + "vnf-name" : "Ete_vFWDTvPKG_97f314d9_0", + "vnf-type" : "vFWDT 2019-05-14 21:39:/vFWDT_vPKG f9ca4e08-2039 0", + "service-id" : "4ac68777-580d-4c77-be9e-715af194eff2", + "prov-status" : "ACTIVE", + "orchestration-status" : "Active", + "in-maint" : false, + "is-closed-loop-disabled" : false, + "resource-version" : "1557870680000", + "model-invariant-id" : "49fa29d6-0785-4841-b866-2a0ec1b58e42", + "model-version-id" : "3b4c7a67-869e-4ad4-a5c0-94292648411b", + "model-customization-id" : "6489a540-0179-4fb3-8a22-77459a89d02b", + "relationship-list" : { + "relationship" : [ { + "related-to" : "service-instance", + "relationship-label" : "org.onap.relationships.inventory.ComposedOf", + "related-link" : "/aai/v14/business/customers/customer/DemoCust_97f314d9-ae80-4161-bc60-2263544dd5cf/service-subscriptions/service-subscription/vFWDT/service-instances/service-instance/70c30689-ed46-4ea9-8c9e-d3d4edd01c9a", + "relationship-data" : [ { + "relationship-key" : "customer.global-customer-id", + "relationship-value" : "DemoCust_97f314d9-ae80-4161-bc60-2263544dd5cf" + }, { + "relationship-key" : "service-subscription.service-type", + "relationship-value" : "vFWDT" + }, { + "relationship-key" : "service-instance.service-instance-id", + "relationship-value" : "70c30689-ed46-4ea9-8c9e-d3d4edd01c9a" + } ], + "related-to-property" : [ { + "property-key" : "service-instance.service-instance-name", + "property-value" : "Service_Ete_Name97f314d9-ae80-4161-bc60-2263544dd5cf" + } ] + }, { + "related-to" : "platform", + "relationship-label" : "org.onap.relationships.inventory.Uses", + "related-link" : "/aai/v14/business/platforms/platform/Platform-Demonstration", + "relationship-data" : [ { + "relationship-key" : "platform.platform-name", + "relationship-value" : "Platform-Demonstration" + } ] + }, { + "related-to" : "vserver", + "relationship-label" : "tosca.relationships.HostedOn", + "related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/09d8566ea45e43aa974cf447ed591d77/vservers/vserver/47df73c0-e35d-488d-864e-53bf103a0c83", + "relationship-data" : [ { + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "CloudOwner" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "RegionOne" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "09d8566ea45e43aa974cf447ed591d77" + }, { + "relationship-key" : "vserver.vserver-id", + "relationship-value" : "47df73c0-e35d-488d-864e-53bf103a0c83" + } ], + "related-to-property" : [ { + "property-key" : "vserver.vserver-name", + "property-value" : "vofwl01pgn14d9" + } ] + } ] + } + } ] + } + } +} ] \ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-list-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-list-schema-dublin-sample.yaml new file mode 100644 index 00000000..a774b33d --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-list-schema-dublin-sample.yaml @@ -0,0 +1,33 @@ +open_cli_sample_version: 1.0 +name: -u +version: onap-dublin +samples: + sample1: + name: -u + input: AAI -p AAI -m https://10.12.6.48:30233 -s + moco: vnf-list-schema-dublin-moco.json + output: | + +----------------------------+--------------------------------------+----------------------------------------------------+------------------+--------------------------------------+--------------------------------------+--------------------------------------+----------------------------------------------------+--------------------------------------+--------------+------------------------------------------------+ + |vnf-name |vnf-id |vnf-type |resource-version |vf-model-version-id |vf-model-invariant-id |vf-model-customization-id |service-instance-name |service-instance-id |service-type |customer-name | + +----------------------------+--------------------------------------+----------------------------------------------------+------------------+--------------------------------------+--------------------------------------+--------------------------------------+----------------------------------------------------+--------------------------------------+--------------+------------------------------------------------+ + |Ete_vFWDTvFWSNK_97f314d9_2 |822103de-eef7-4dbb-a903-ee63d1d6c828 |vFWDT 2019-05-14 21:39:/vFWDT_vFWSNK |1557871053443 |9decac39-dc36-4d75-a163-4cac545962da |b4a756f2-abc3-4abb-ad72-bb1c74ead69b |3290f4d7-3067-4182-9882-a2874d24210e |Service_Ete_Name97f314d9-ae80-4161-bc60-2263544dd5 |70c30689-ed46-4ea9-8c9e-d3d4edd01c9a |vFWDT |DemoCust_97f314d9-ae80-4161-bc60-2263544dd5cf | + | | |f6f516d5-df46 1 | | | | |cf | | | | + +----------------------------+--------------------------------------+----------------------------------------------------+------------------+--------------------------------------+--------------------------------------+--------------------------------------+----------------------------------------------------+--------------------------------------+--------------+------------------------------------------------+ + |Ete_vFWCLvFWSNK_36e8ed23_0 |52a4b034-828e-4a5c-9895-000aaf6cc05f |vFWCL 2019-05-14 19:51:/vFWCL_vFWSNK |1557864105199 |d068ba61-84e3-47ee-837f-62740f59498e |505c7e39-4355-4f6b-8add-38e28f13fbc5 |466da017-be2f-4764-a3ed-0a838597542b |Service_Ete_Name36e8ed23-b928-4cea-ad8a-e9709e721e |aa521249-0c8d-4765-8d19-0335847c9c7f |vFWCL |DemoCust_36e8ed23-b928-4cea-ad8a-e9709e721ed8 | + | | |585f812d-2d8b 0 | | | | |d8 | | | | + +----------------------------+--------------------------------------+----------------------------------------------------+------------------+--------------------------------------+--------------------------------------+--------------------------------------+----------------------------------------------------+--------------------------------------+--------------+------------------------------------------------+ + |Ete_vFWCLvFWSNK_d3e7a9ba_0 |08e98ea9-e945-4ce2-b520-76ca11ff7c5f |vFWCL 2019-05-14 19:35:/vFWCL_vFWSNK |1557863204408 |db870ede-6df9-4995-bbcb-aa579352043f |24b21516-72dd-4569-a6c6-040b463de068 |9edda94c-e1db-43c9-82b9-651330b4f744 |Service_Ete_Named3e7a9ba-d88a-43dc-9b0c-7999659f85 |7e63e1d0-9a4d-456a-8870-ed7229b88fae |vFWCL |DemoCust_d3e7a9ba-d88a-43dc-9b0c-7999659f85d9 | + | | |fd3acb2c-c0f5 0 | | | | |d9 | | | | + +----------------------------+--------------------------------------+----------------------------------------------------+------------------+--------------------------------------+--------------------------------------+--------------------------------------+----------------------------------------------------+--------------------------------------+--------------+------------------------------------------------+ + |Ete_vFWDTvFWSNK_97f314d9_1 |0957e4f3-109a-4937-898d-295f58ba2fc6 |vFWDT 2019-05-14 21:39:/vFWDT_vFWSNK |1557870869928 |9decac39-dc36-4d75-a163-4cac545962da |b4a756f2-abc3-4abb-ad72-bb1c74ead69b |3290f4d7-3067-4182-9882-a2874d24210e |Service_Ete_Name97f314d9-ae80-4161-bc60-2263544dd5 |70c30689-ed46-4ea9-8c9e-d3d4edd01c9a |vFWDT |DemoCust_97f314d9-ae80-4161-bc60-2263544dd5cf | + | | |f6f516d5-df46 1 | | | | |cf | | | | + +----------------------------+--------------------------------------+----------------------------------------------------+------------------+--------------------------------------+--------------------------------------+--------------------------------------+----------------------------------------------------+--------------------------------------+--------------+------------------------------------------------+ + |Ete_vFWCLvFWSNK_d3e7a9ba_0 |3c44cd16-bb4b-407f-8b44-49cd4c53562e |vFWCL 2019-05-14 19:35:/vFWCL_vFWSNK |1557863091272 |db870ede-6df9-4995-bbcb-aa579352043f |24b21516-72dd-4569-a6c6-040b463de068 |9edda94c-e1db-43c9-82b9-651330b4f744 |Service_Ete_Named3e7a9ba-d88a-43dc-9b0c-7999659f85 |7e63e1d0-9a4d-456a-8870-ed7229b88fae |vFWCL |DemoCust_d3e7a9ba-d88a-43dc-9b0c-7999659f85d9 | + | | |fd3acb2c-c0f5 0 | | | | |d9 | | | | + +----------------------------+--------------------------------------+----------------------------------------------------+------------------+--------------------------------------+--------------------------------------+--------------------------------------+----------------------------------------------------+--------------------------------------+--------------+------------------------------------------------+ + |Ete_vFW_dc5d3d44_0 |d6e21697-1195-4512-a44a-c9c914378eda |vFW 2019-05-14 21:11:13/vFW b709db2f-0039 0 |1557868764828 |6775ea75-1237-436c-a51a-b7dd1aa0f0df |f04950b2-765c-4c42-ac7c-cb05aacc4a26 |f222bbde-7d37-4f59-b00b-92125025d1ef |Service_Ete_Namedc5d3d44-62ef-49ff-a8c9-c0108c68c4 |b1928ef8-fd57-41db-a7f4-f3507efc44a4 |vFW |DemoCust_dc5d3d44-62ef-49ff-a8c9-c0108c68c456 | + | | | | | | | |56 | | | | + +----------------------------+--------------------------------------+----------------------------------------------------+------------------+--------------------------------------+--------------------------------------+--------------------------------------+----------------------------------------------------+--------------------------------------+--------------+------------------------------------------------+ + |Ete_vFWDTvPKG_97f314d9_0 |01d4ae85-04ca-4eb0-a636-76f690103067 |vFWDT 2019-05-14 21:39:/vFWDT_vPKG f9ca4e08-2039 0 |1557870680000 |3b4c7a67-869e-4ad4-a5c0-94292648411b |49fa29d6-0785-4841-b866-2a0ec1b58e42 |6489a540-0179-4fb3-8a22-77459a89d02b |Service_Ete_Name97f314d9-ae80-4161-bc60-2263544dd5 |70c30689-ed46-4ea9-8c9e-d3d4edd01c9a |vFWDT |DemoCust_97f314d9-ae80-4161-bc60-2263544dd5cf | + | | | | | | | |cf | | | | + +----------------------------+--------------------------------------+----------------------------------------------------+------------------+--------------------------------------+--------------------------------------+--------------------------------------+----------------------------------------------------+--------------------------------------+--------------+------------------------------------------------+ diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-dublin.yaml new file mode 100644 index 00000000..511affc6 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-dublin.yaml @@ -0,0 +1,61 @@ +# Copyright © Intel Corporation 2019 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: service-instance-list +description: List the existing service instances + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +results: + direction: landscape + attributes: + - name: service-instance-name + description: Name of service instance + scope: short + type: string + - name: service-instance-id + description: Id of service instance + scope: short + type: string + - name: resource-version + description: resource version + scope: short + type: string + - name: service-model-version-id + description: version id of service model + scope: short + type: string + - name: service-model-invariant-id + description: Invariant Id of service model + scope: short + type: string +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v14/nodes/service-instances/ + method: GET + success_codes: + - 200 + result_map: + service-instance-name: $b{service-instance.[*].service-instance-name} + service-instance-id: $b{service-instance.[*].service-instance-id} + resource-version: $b{service-instance.[*].resource-version} + service-model-version-id: $b{service-instance.[*].model-version-id} + service-model-invariant-id: $b{service-instance.[*].model-invariant-id} diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-schema-dublin.yaml new file mode 100644 index 00000000..046ca7b8 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-schema-dublin.yaml @@ -0,0 +1,60 @@ +# Copyright © Intel Corporation 2019 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: vf-module-list +description: List the VF module in a VNF instance + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: vnf-id + description: id of vnf instance + type: string + short_option: x + long_option: vnf-id + is_optional: false + +results: + direction: landscape + attributes: + - name: vf-module-name + description: Name of the vf-module + scope: short + type: string + - name: vf-module-id + description: Id of the vf-module + scope: short + type: string + - name: resource-version + description: resource version of the vf module + scope: short + type: string + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v14/network/generic-vnfs/generic-vnf/${vnf-id}/vf-modules + method: GET + success_codes: + - 200 + result_map: + vf-module-name: $b{vf-module.[*].vf-module-name} + vf-module-id: $b{vf-module.[*].vf-module-id} + resource-version: $b{vf-module.[*].resource-version} diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-list-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-list-schema-dublin.yaml new file mode 100644 index 00000000..f49390d4 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-list-schema-dublin.yaml @@ -0,0 +1,93 @@ +# Copyright © Intel Corporation 2019 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: vnf-list +description: List all the generic vnfs + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +results: + direction: landscape + attributes: + - name: vnf-name + description: Name of VNF + scope: short + type: string + - name: vnf-id + description: Id of VNF + scope: short + type: string + - name: vnf-type + description: Type of VNF (composed of the service model name and the vf model name) + scope: short + type: string + - name: resource-version + description: resource version of VNF + scope: short + type: string + - name: vf-model-version-id + description: Version Id of its VF model + scope: long + type: string + - name: vf-model-invariant-id + description: Invariant Id of its VF model + scope: long + type: string + - name: vf-model-customization-id + description: Customization Id of its VF model + scope: long + type: string + - name: service-instance-name + description: Name of its service instance + scope: short + type: string + - name: service-instance-id + description: Id of its service instance + scope: short + type: string + - name: service-type + description: subsription service type + scope: long + type: string + - name: customer-name + description: global customer id + scope: long + type: string + + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v14/network/generic-vnfs/ + method: GET + success_codes: + - 200 + result_map: + vnf-name: $b{generic-vnf.[*].vnf-name} + vnf-id: $b{generic-vnf.[*].vnf-id} + vnf-type: $b{generic-vnf.[*].vnf-type} + resource-version: $b{generic-vnf.[*].resource-version} + service-instance-name: $b{generic-vnf.[*].relationship-list.relationship.[*].related-to-property.[?(@.property-key == 'service-instance.service-instance-name')].property-value} + service-instance-id: $b{generic-vnf.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'service-instance.service-instance-id')].relationship-value} + service-type: $b{generic-vnf.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'service-subscription.service-type')].relationship-value} + customer-name: $b{generic-vnf.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'customer.global-customer-id')].relationship-value} + vf-model-version-id: $b{generic-vnf.[*].model-version-id} + vf-model-invariant-id: $b{generic-vnf.[*].model-invariant-id} + vf-model-customization-id: $b{generic-vnf.[*].model-customization-id} diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-list-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-list-schema-dublin.yaml deleted file mode 100644 index 912016f7..00000000 --- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-list-schema-dublin.yaml +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright © Intel Corporation 2019 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -open_cli_schema_version: 1.0 -name: service-list -description: List all service instances from SO - -info: - product: onap-dublin - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - -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: digit - - name: nodes - description: Onap service running nodes - scope: long - type: json - - name: enable-ssl - description: Onap service is enabled with https or not - scope: long - type: string - - name: path - description: Onap service path - scope: long - type: string - - -http: - service: - name: so - version: v6 - auth: basic - mode: direct - request: - uri: /onap/so/infra/serviceInstances/v6 - method: GET - success_codes: - - 201 - - 200 - result_map: - name: $b{$.[*].serviceName} - version: $b{$.[*].version} - url: $b{$.[*].url} - status: $b{$.[*].status} - enable-ssl: $b{$.[*].enable_ssl} - path: $b{$.[*].path} - nodes: $b{$.[*].nodes[*].ip}:$b{$.[*].nodes[*].port} - sample_response: - body: '{ - "requestReferences":{ - "instanceId":"${instance-id}", - "requestId":"375ba428-65e7-4f2b-afb9-74735ac6bfd0" - } - }' diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-list-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-list-schema-dublin.yaml deleted file mode 100644 index e9d1ca73..00000000 --- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-list-schema-dublin.yaml +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright © Intel Corporation 2019 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -open_cli_schema_version: 1.0 -name: vf-module-list -description: List all VF Modules - -info: - product: onap-dublin - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - -parameters: - - name: lcp-cloudregion-id - description: AIC LCP node location identifier - type: string - short_option: l - long_option: lcp-cloudregion-id - is_optional: false - - name: tenant-id - description: openstack tenant id (uuid) - type: string - short_option: w - long_option: tenant-id - is_optional: false - - name: vnf-instance-id - description: vnf instance id - type: string - short_option: y - long_option: vnf-instace-id - is_optional: false - - name: service-instance-id - description: unique id for service instance - type: string - short_option: x - long_option: service-instace-id - is_optional: false - - name: parenet-service-model - description: parent service model name - type: string - short_option: z - long_option: parenet-service-model - is_optional: false - - name: supress-rollback - description: rollback changes if instantiation fails. - type: bool - short_option: r - long_option: supress-rollback - is_optional: true - - name: instance-name - description: service instance name - type: string - short_option: i - long_option: instance-name - is_optional: false - -results: - direction: portrait - attribute: - - name: vf-instance-id - description: id for the created vf - type: string - scope: short - -http: - service: - name: so - version: v6 - auth: basic - mode: direct - request: - uri: /onap/so/infra/serviceInstances/v6/${service-instance-id}/vnfs/${vnf-instance-id}/vfModules - method: PUT - body: '{ - "requestDetails":{ - "modelInfo":{ - "modelType":"vfModule", - "modelInvariantId":"ff5256d2-5a33-55df-13ab-12abad84e7ff", - "modelNameVersionId":"fe6478e5-ea33-3346-ac12-ab121484a3fe", - "modelName":"vSAMP12..base..module-0", - "modelVersion":"1" - }, - "cloudConfiguration":{ - "lcpCloudRegionId":"${lcp-cloudregion-id}", - "tenantId":"${tenant-id}" - }, - "requestInfo":{ - "instanceName":"${instance-name}", - "source":"VID", - "suppressRollback":"${supress-rollback}" - }, - "relatedInstanceList":[ - { - "relatedInstance":{ - "instanceId":"${service-instance-id}", - "modelInfo":{ - "modelType":"service", - "modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff", - "modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe", - "modelName":"${parenet-service-model}", - "modelVersion":"1.0" - } - } - }, - { - "relatedInstance":{ - "instanceId":"${vnf-instance-id}", - "modelInfo":{ - "modelType":"vnf", - "modelInvariantId":"ff5256d1-5a33-55df-13ab-12abad84e7ff", - "modelNameVersionId":"fe6478e4-ea33-3346-ac12-ab121484a3fe", - "modelName":"vSAMP12", - "modelVersion":"1.0", - "modelCustomizationName":"vSAMP12 1" - } - } - } - ], - "requestParameters":{ - "userParams":[ - - ] - } - } - }' - - success_codes: - - 202 - result_mpa: - vf-instance-id: $b{$.vfInstanceId} - sample_response: - body: '{ "vfInstanceId" : "234567AB" }' diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-list-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-list-schema-dublin.yaml deleted file mode 100644 index 51b00312..00000000 --- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-list-schema-dublin.yaml +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright © Intel Corporation 2019 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -open_cli_schema_version: 1.0 -name: vnf-list -description: List all VNFs - -info: - product: onap-dublin - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - - -parameters: - - name: cloud-region - description: cloud region identifier - type: string - short_option: l - long_option: cloud-region - is_optional: false - - name: tenant-id - description: openstack tenant id - type: string - short_option: z - long_option: tenant-id - is_optional: false - - name: product-family - description: service type for serivce (e.g. vLB) - type: string - short_option: w - long_option: product-family - is_optional: false - - name: instance-name - description: service instance name - type: string - short_option: o - long_option: instance-name - is_optional: false - - name: service-instance-id - description: unique id for service instance - type: string - short_option: y - long_option: service-instance-id - is_optional: false - - name: vf-model-invariant-id - description: vf model invariant id - type: string - short_option: b - long_option: vf-model-invariant-id - is_optional: false - - name: vf-model-uuid - description: model uuid for vf - type: string - short_option: c - long_option: vf-model-uuid - is_optional: false - - name: vf-model-name - description: vf model name - type: string - short_option: e - long_option: vf-model-name - is_optional: false - - name: vf-model-version - description: vf model version - type: string - short_option: g - long_option: vf-model-version - is_optional: false - - name: vf-model-customization-id - description: vf model customization id - type: string - short_option: i - long_option: vf-model-customization-id - is_optional: false - - name: service-model-invariant-id - description: model invariant id - type: string - short_option: j - long_option: service-model-invariant-id - is_optional: false - - name: service-model-uuid - description: model name version id - type: string - short_option: k - long_option: service-model-uuid - is_optional: false - - name: service-model-name - description: service model name - type: string - short_option: q - long_option: service-model-name - is_optional: false - - name: service-model-version - description: service model version - type: string - short_option: n - long_option: service-model-version - is_optional: false - - name: requestor-id - description: requestor ID - type: string - short_option: r - long_option: requestor-id - is_optional: false - - -results: - direction: portrait - attributes: - - name: vf-id - description: id for the created vnf - type: string - scope: short - -http: - service: - name: so - version: v6 - auth: basic - mode: direct - request: - uri: /onap/so/infra/serviceInstances/v6/${service-instance-id}/vnfs - method: POST - body: '{ - "requestDetails":{ - "modelInfo":{ - "modelType":"vnf", - "modelInvariantId":"${vf-model-invariant-id}", - "modelVersionId":"${vf-model-uuid}", - "modelName":"${vf-model-name}", - "modelVersion":"${vf-model-version}", - "modelCustomizationId":"${vf-model-customization-id}" - }, - "cloudConfiguration":{ - "lcpCloudRegionId":"${cloud-region}", - "tenantId":"${tenant-id}" - }, - "requestInfo":{ - "requestorId":"${requestor-id}", - "instanceName":"${instance-name}", - "source":"VID", - "productFamilyId":"${product-family}" - }, - "relatedInstanceList":[ - { - "relatedInstance":{ - "instanceId":"${service-instance-id}", - "modelInfo":{ - "modelType":"service", - "modelInvariantId":"${service-model-invariant-id}", - "modelVersionId":"${service-model-uuid}", - "modelName":"${service-model-name}", - "modelVersion":"${service-model-version}" - } - } - } - ], - "requestParameters":{ - - } - } - }' - - success_codes: - - 202 - result_map: - vf-id: $b{$.requestReferences.instanceId} - sample_response: - body: '{ - "requestReferences":{ - "instanceId":"2a152730-f6eb-4dc6-9b81-7a6f6f263d71", - "requestId":"6402628f-7f67-4605-9e60-0d8632616d02" - } - }' -- cgit 1.2.3-korg