summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam <kanagaraj.manickam@huawei.com>2017-10-31 12:11:07 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-31 12:11:07 +0000
commit6d3a4e3530a8e17d46641c96ec8ef8e3e822dea2 (patch)
treed5ac3ae23487d8ae9c0eaad2437b907395308531
parent201b28a2fb00db5ed83aac5ed92c149ffc38867f (diff)
parentc235c2f38ad6fb035977e7d32afc294dd6486931 (diff)
Merge changes I5c68f53c,Ia7184ff4
* changes: Imlement command to show vf detail Implement command for vnf-list
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-list-schema-1.1.yaml53
-rw-r--r--plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-show-schema-1.1.yaml64
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-moco.json137
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml32
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-moco.json55
-rw-r--r--plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml26
6 files changed, 367 insertions, 0 deletions
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-list-schema-1.1.yaml
new file mode 100644
index 00000000..b29f5d0f
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-list-schema-1.1.yaml
@@ -0,0 +1,53 @@
+open_cli_schema_version: 1.0
+name: vf-list
+description: List created VF instances for a service instance
+version: onap-1.1
+service:
+ name: aai
+ version: v11
+ auth: basic
+ mode: direct
+
+parameters:
+ - name: customer-name
+ description: customer name
+ type: string
+ short_option: x
+ long_option: customer-name
+ is_optional: false
+ - name: service-type
+ description: service subscription type
+ type: string
+ short_option: y
+ long_option: service-type
+ is_optional: false
+ - name: service-id
+ description: service ID
+ type: string
+ short_option: z
+ long_option: service-id
+ is_optional: false
+
+results:
+ direction: landscape
+ attributes:
+ - name: vf-id
+ description: VF ID for the given service
+ scope: short
+ type: string
+ - name: vf-name
+ description: VF name
+ scope: short
+ type: string
+
+http:
+ request:
+ uri: /aai/v11/business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}/service-instances/service-instance/${service-id}
+ method: GET
+ success_codes:
+ - 200
+ result_map:
+ vf-id: $b{relationship-list.relationship.[*].relationship-data[?(@.relationship-key=='generic-vnf.vnf-id')].relationship-value}
+ vf-name: $b{relationship-list.relationship.[*].related-to-property.[?(@.property-key == 'generic-vnf.vnf-name')].property-value}
+ sample_response:
+ body: '{"service-instance": [{"service-instance-id": "${service-id}","service-instance-name": "${service-name}","description": "${description}","model-invariant-id": "${model-invariant-id}","model-version-id": "${model-uuid}"}]}'
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-show-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-show-schema-1.1.yaml
new file mode 100644
index 00000000..01cb9bd4
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-show-schema-1.1.yaml
@@ -0,0 +1,64 @@
+open_cli_schema_version: 1.0
+name: vf-show
+description: Show details for VF
+version: onap-1.1
+service:
+ name: aai
+ version: v11
+ auth: basic
+ mode: direct
+
+parameters:
+ - name: vf-id
+ description: VF identifier
+ type: string
+ short_option: x
+ long_option: vf-id
+ is_optional: false
+
+results:
+ direction: portrait
+ attributes:
+ - name: vf-id
+ description: VF ID for the given service
+ scope: short
+ type: string
+ - name: vf-name
+ description: VF name
+ scope: short
+ type: string
+ - name: vf-type
+ description: VF name
+ scope: short
+ type: string
+ - name: model-invariant-id
+ description: VF name
+ scope: short
+ type: string
+ - name: model-uuid
+ description: model uuid
+ scope: short
+ type: string
+ - name: model-customization-id
+ description: Model customization id
+ scope: short
+ type: string
+ - name: service-id
+ description: Service ID of parent service
+ scope: short
+ type: string
+
+http:
+ request:
+ uri: /aai/v11/network/generic-vnfs/generic-vnf/${vf-id}
+ method: GET
+ success_codes:
+ - 200
+ result_map:
+ vf-id: $b{vnf-id}
+ vf-name: $b{vnf-name}
+ vf-type: $b{vnf-type}
+ model-invariant-id: $b{model-invariant-id}
+ model-uuid: $b{model-version-id}
+ model-customization-id: $b{model-customization-id}
+ service-id: $b{$.relationship-list.relationship.[*].relationship-data.[?(@.relationship-key=='service-instance.service-instance-id')].relationship-value} \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-moco.json
new file mode 100644
index 00000000..096b5992
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-moco.json
@@ -0,0 +1,137 @@
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v11/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vLB/service-instances/service-instance/2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-9f249fd5-ea11-439e-b205-e814325b95ff",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "service-instance-id" : "2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee",
+ "service-instance-name" : "sample-instance-cli-10",
+ "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb",
+ "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0",
+ "resource-version" : "1509109122018",
+ "relationship-list" : {
+ "relationship" : [ {
+ "related-to" : "generic-vnf",
+ "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/1a667ce8-8b8b-4f59-ba5c-b162ae462fef",
+ "relationship-data" : [ {
+ "relationship-key" : "generic-vnf.vnf-id",
+ "relationship-value" : "1a667ce8-8b8b-4f59-ba5c-b162ae462fef"
+ } ],
+ "related-to-property" : [ {
+ "property-key" : "generic-vnf.vnf-name",
+ "property-value" : "vlb-cli-sample-8"
+ } ]
+ }, {
+ "related-to" : "generic-vnf",
+ "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/048c2c4a-ee30-41a1-bb55-c4e7fe1a9a0d",
+ "relationship-data" : [ {
+ "relationship-key" : "generic-vnf.vnf-id",
+ "relationship-value" : "048c2c4a-ee30-41a1-bb55-c4e7fe1a9a0d"
+ } ],
+ "related-to-property" : [ {
+ "property-key" : "generic-vnf.vnf-name",
+ "property-value" : "vlb-cli-sample-11"
+ } ]
+ }, {
+ "related-to" : "generic-vnf",
+ "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/c37c401f-a839-4b6e-9c65-33e023c412ee",
+ "relationship-data" : [ {
+ "relationship-key" : "generic-vnf.vnf-id",
+ "relationship-value" : "c37c401f-a839-4b6e-9c65-33e023c412ee"
+ } ],
+ "related-to-property" : [ {
+ "property-key" : "generic-vnf.vnf-name",
+ "property-value" : "vlb-cli-sample-10"
+ } ]
+ }, {
+ "related-to" : "generic-vnf",
+ "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/b544f164-97c9-483a-98eb-eafd1f808e79",
+ "relationship-data" : [ {
+ "relationship-key" : "generic-vnf.vnf-id",
+ "relationship-value" : "b544f164-97c9-483a-98eb-eafd1f808e79"
+ } ],
+ "related-to-property" : [ {
+ "property-key" : "generic-vnf.vnf-name",
+ "property-value" : "vlb-cli-sample-5"
+ } ]
+ }, {
+ "related-to" : "generic-vnf",
+ "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/5ef95bd9-4d7a-4d06-879e-0c7964f9de65",
+ "relationship-data" : [ {
+ "relationship-key" : "generic-vnf.vnf-id",
+ "relationship-value" : "5ef95bd9-4d7a-4d06-879e-0c7964f9de65"
+ } ],
+ "related-to-property" : [ {
+ "property-key" : "generic-vnf.vnf-name",
+ "property-value" : "vlb-cli-sample-4"
+ } ]
+ }, {
+ "related-to" : "generic-vnf",
+ "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/eb29edb5-0a9f-4bc6-a7bf-3211341fffc2",
+ "relationship-data" : [ {
+ "relationship-key" : "generic-vnf.vnf-id",
+ "relationship-value" : "eb29edb5-0a9f-4bc6-a7bf-3211341fffc2"
+ } ],
+ "related-to-property" : [ {
+ "property-key" : "generic-vnf.vnf-name",
+ "property-value" : "vlb-cli-sample-9"
+ } ]
+ }, {
+ "related-to" : "generic-vnf",
+ "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/2a152730-f6eb-4dc6-9b81-7a6f6f263d71",
+ "relationship-data" : [ {
+ "relationship-key" : "generic-vnf.vnf-id",
+ "relationship-value" : "2a152730-f6eb-4dc6-9b81-7a6f6f263d71"
+ } ],
+ "related-to-property" : [ {
+ "property-key" : "generic-vnf.vnf-name",
+ "property-value" : "vlb-cli-sample-1"
+ } ]
+ }, {
+ "related-to" : "generic-vnf",
+ "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/f53cd512-e172-410e-87b4-37064b5b5f8c",
+ "relationship-data" : [ {
+ "relationship-key" : "generic-vnf.vnf-id",
+ "relationship-value" : "f53cd512-e172-410e-87b4-37064b5b5f8c"
+ } ],
+ "related-to-property" : [ {
+ "property-key" : "generic-vnf.vnf-name",
+ "property-value" : "vlb-cli-sample-7"
+ } ]
+ }, {
+ "related-to" : "generic-vnf",
+ "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/f4bfcd6a-2ea1-42ab-853a-5d863b150c40",
+ "relationship-data" : [ {
+ "relationship-key" : "generic-vnf.vnf-id",
+ "relationship-value" : "f4bfcd6a-2ea1-42ab-853a-5d863b150c40"
+ } ],
+ "related-to-property" : [ {
+ "property-key" : "generic-vnf.vnf-name",
+ "property-value" : "vlb-cli-sample-3"
+ } ]
+ }, {
+ "related-to" : "generic-vnf",
+ "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/4bb4beaa-5b6b-414e-97d8-53949bbb5c5e",
+ "relationship-data" : [ {
+ "relationship-key" : "generic-vnf.vnf-id",
+ "relationship-value" : "4bb4beaa-5b6b-414e-97d8-53949bbb5c5e"
+ } ],
+ "related-to-property" : [ {
+ "property-key" : "generic-vnf.vnf-name",
+ "property-value" : "vlb-cli-sample-6"
+ } ]
+ } ]
+ }
+ }
+ }
+} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml
new file mode 100644
index 00000000..3d9f05e3
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml
@@ -0,0 +1,32 @@
+onap_cli_sample_version: 1.0
+name: vf-list
+version: onap-1.1
+samples:
+ sample1:
+ name: vf-list
+ input: -x Demonstration -y vLB --service-id 2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee
+ moco: vf-list-schema-1.1-moco.json
+ ouput: |
+ +--------------------------------------+--------------------+
+ |vf-id |vf-name |
+ +--------------------------------------+--------------------+
+ |1a667ce8-8b8b-4f59-ba5c-b162ae462fef |vlb-cli-sample-8 |
+ +--------------------------------------+--------------------+
+ |048c2c4a-ee30-41a1-bb55-c4e7fe1a9a0d |vlb-cli-sample-11 |
+ +--------------------------------------+--------------------+
+ |c37c401f-a839-4b6e-9c65-33e023c412ee |vlb-cli-sample-10 |
+ +--------------------------------------+--------------------+
+ |b544f164-97c9-483a-98eb-eafd1f808e79 |vlb-cli-sample-5 |
+ +--------------------------------------+--------------------+
+ |5ef95bd9-4d7a-4d06-879e-0c7964f9de65 |vlb-cli-sample-4 |
+ +--------------------------------------+--------------------+
+ |eb29edb5-0a9f-4bc6-a7bf-3211341fffc2 |vlb-cli-sample-9 |
+ +--------------------------------------+--------------------+
+ |2a152730-f6eb-4dc6-9b81-7a6f6f263d71 |vlb-cli-sample-1 |
+ +--------------------------------------+--------------------+
+ |f53cd512-e172-410e-87b4-37064b5b5f8c |vlb-cli-sample-7 |
+ +--------------------------------------+--------------------+
+ |f4bfcd6a-2ea1-42ab-853a-5d863b150c40 |vlb-cli-sample-3 |
+ +--------------------------------------+--------------------+
+ |4bb4beaa-5b6b-414e-97d8-53949bbb5c5e |vlb-cli-sample-6 |
+ +--------------------------------------+--------------------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-moco.json
new file mode 100644
index 00000000..3d697e03
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-moco.json
@@ -0,0 +1,55 @@
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v11/network/generic-vnfs/generic-vnf/1a667ce8-8b8b-4f59-ba5c-b162ae462fef",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "onap-cli",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-46bd1d68-55a3-442a-91b3-850787784bab",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "vnf-id" : "1a667ce8-8b8b-4f59-ba5c-b162ae462fef",
+ "vnf-name" : "vlb-cli-sample-8",
+ "vnf-type" : "demoVLB/null",
+ "service-id" : "vLB",
+ "prov-status" : "PREPROV",
+ "orchestration-status" : "Created",
+ "in-maint" : false,
+ "is-closed-loop-disabled" : false,
+ "resource-version" : "1509115214962",
+ "model-invariant-id" : "cc34cd54-dd7c-44cd-8847-f9577c6f1a49",
+ "model-version-id" : "8b1f63f3-e0cc-4c27-8903-fafe2f25bfbe",
+ "model-customization-id" : "cf893f5a-1bb1-4e32-a92b-2456e12178f8",
+ "nf-type" : "",
+ "nf-function" : "",
+ "nf-role" : "",
+ "nf-naming-code" : "",
+ "relationship-list" : {
+ "relationship" : [ {
+ "related-to" : "service-instance",
+ "related-link" : "/aai/v11/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vLB/service-instances/service-instance/2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee",
+ "relationship-data" : [ {
+ "relationship-key" : "customer.global-customer-id",
+ "relationship-value" : "Demonstration"
+ }, {
+ "relationship-key" : "service-subscription.service-type",
+ "relationship-value" : "vLB"
+ }, {
+ "relationship-key" : "service-instance.service-instance-id",
+ "relationship-value" : "2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee"
+ } ],
+ "related-to-property" : [ {
+ "property-key" : "service-instance.service-instance-name",
+ "property-value" : "sample-instance-cli-10"
+ } ]
+ } ]
+ }
+ }
+ }
+} ] \ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml
new file mode 100644
index 00000000..ad94345f
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml
@@ -0,0 +1,26 @@
+onap_cli_sample_version: 1.0
+name: vf-show
+version: onap-1.1
+samples:
+ sample1:
+ name: vf-show
+ input: --vf-id 1a667ce8-8b8b-4f59-ba5c-b162ae462fef -m https://192.168.17.111:8443 -u AAI -p AAI
+ moco: vf-show-schema-1.1-moco.json
+ ouput: |
+ +------------------------+--------------------------------------+
+ |property |value |
+ +------------------------+--------------------------------------+
+ |vf-id |1a667ce8-8b8b-4f59-ba5c-b162ae462fef |
+ +------------------------+--------------------------------------+
+ |vf-name |vlb-cli-sample-8 |
+ +------------------------+--------------------------------------+
+ |vf-type |demoVLB/null |
+ +------------------------+--------------------------------------+
+ |model-invariant-id |cc34cd54-dd7c-44cd-8847-f9577c6f1a49 |
+ +------------------------+--------------------------------------+
+ |model-uuid |8b1f63f3-e0cc-4c27-8903-fafe2f25bfbe |
+ +------------------------+--------------------------------------+
+ |model-customization-id |cf893f5a-1bb1-4e32-a92b-2456e12178f8 |
+ +------------------------+--------------------------------------+
+ |service-id |2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee |
+ +------------------------+--------------------------------------+