Merges from 1.1.0

Issue-Id: CLI-66

Change-Id: I89fde334e2425eb91630912d726c320ece4aebd6
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

3 files changed, 194 insertions, 0 deletions

diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml
new file mode 100644
index 00000000..97909598
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml
@@ -0,0 +1,67 @@
+open_cli_schema_version: 1.0
+name: service-list
+description: List created service instance
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+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
+
+results:
+  direction: landscape
+  attributes:
+    - name: service-id
+      description: instance id of service
+      scope: short
+      type: string
+    - name: service-name
+      description: Service name
+      scope: short
+      type: string
+    - name: model-invariant-id
+      description: Model invariant id of service model
+      scope: long
+      type: string
+    - name: model-uuid
+      description: Model uuid for service model
+      scope: long
+      type: string
+    - name: description
+      description: service description
+      scope: long
+      type: string
+
+http:
+  service:
+    name: aai
+    version: v11
+    auth: basic
+    mode: direct
+
+  request:
+    uri: /aai/v11/business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}/service-instances
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    service-id: $b{service-instance.[*].service-instance-id}
+    service-name: $b{service-instance.[*].service-instance-name}
+    model-invariant-id: $b{service-instance.[*].model-invariant-id}
+    model-uuid: $b{service-instance.[*].model-version-id}
+    description: $b{service-instance.[*].description}
+  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/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml
new file mode 100644
index 00000000..0a9fa905
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml
@@ -0,0 +1,58 @@
+open_cli_schema_version: 1.0
+name: vf-list
+description: List created VF instances for a service instance
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+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:
+  service:
+    name: aai
+    version: v11
+    auth: basic
+    mode: direct
+
+  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/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml
new file mode 100644
index 00000000..c9546dea
--- /dev/null
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml
@@ -0,0 +1,69 @@
+open_cli_schema_version: 1.0
+name: vf-show
+description: Show details for VF
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+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:
+  service:
+    name: aai
+    version: v11
+    auth: basic
+    mode: direct
+
+  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