From 5cc909d9db5c2b66f8f34aa6d30048314791c55c Mon Sep 17 00:00:00 2001
From: XingXiaocheng <xingxiaocheng@huawei.com>
Date: Tue, 13 Mar 2018 14:11:50 +0000
Subject: yaml update for pnf

Change-Id: I85e797a02a9980f0226025737446a4b478493da6
Issue-ID: CLI-93
Signed-off-by: xingxiaocheng <xingxiaocheng@huawei.com>
---
 .../open-cli-schema/pnf/pnf-create-schema.yaml     | 79 ++++++++++++++++++++++
 .../open-cli-schema/pnf/pnf-delete-schema.yaml     | 47 +++++++++++++
 .../open-cli-schema/pnf/pnf-list-schema.yaml       | 47 +++++++++++++
 3 files changed, 173 insertions(+)
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-create-schema.yaml
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-delete-schema.yaml
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-list-schema.yaml

(limited to 'products/onap-beijing/features')

diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-create-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-create-schema.yaml
new file mode 100644
index 00000000..7b7b3bbb
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-create-schema.yaml
@@ -0,0 +1,79 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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: pnf-create
+description: Create a pnf
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: pnf-name
+    description: pnf-name
+    type: string
+    short_option: n
+    long_option: name
+    is_optional: false
+  - name: pnf-id
+    description: pnf-id
+    type: string
+    short_option: i
+    long_option: pnf-id
+    is_optional: true
+  - name: equip-type
+    description: equip-type
+    type: string
+    short_option: t
+    long_option: equipType
+    is_optional: true
+  - name: equip-vendor
+    description: equip-vendor
+    type: string
+    short_option: v
+    long_option: equip-vendor
+    is_optional: true
+  - name: in-maint
+    description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
+    type: bool
+    short_option: i
+    long_option: in-maint
+    is_optional: true
+  - name: prov-status
+    description: Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]
+    type: string
+    short_option: s
+    long_option: prov-status
+    is_optional: true
+  - name: relationship
+    description: relationship
+    type: json
+    short_option: r
+    long_option: relationship
+    is_optional: true
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/network/pnfs/pnf/${pnf-name}
+    method: PUT
+    context:
+      remove_empty_node: true
+    body: '{"pnf-name": "${pnf-name}" ,"pnf-id": "${pnf-id}","equip-type": "${equip-type}","equip-vendor": "${equip-vendor}"，"in-maint": ${in-maint}，"prov-status": "${prov-status}"，"relationship-list": ["${relationship}"]}'
+  success_codes:
+    - 200
+    - 201
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-delete-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-delete-schema.yaml
new file mode 100644
index 00000000..cbc4b57c
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-delete-schema.yaml
@@ -0,0 +1,47 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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: pnf-delete
+description: Delete pnf from Onap
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+
+parameters:
+  - name: pnf-name
+    description: Onap pnf name
+    type: string
+    short_option: n
+    long_option: pnf-name
+    is_optional: false
+  - name: resource-version
+    description: Onap pnf resource version
+    type: uuid
+    short_option: v
+    long_option: resource-version
+    is_optional: false
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/network/pnfs/pnf/${pnf-name}?resource-version=${resource-version}
+    method: DELETE
+  success_codes:
+    - 204
+    - 404
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-list-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-list-schema.yaml
new file mode 100644
index 00000000..fd5832b0
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-list-schema.yaml
@@ -0,0 +1,47 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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: pnf-list
+description: Lists the pnfs
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+results:
+  direction: landscape
+  attributes:
+    - name: pnf-name
+      description: Onap pnf name
+      scope: short
+      type: string
+    - name: pnf-id
+      description: Onap pnf id
+      scope: short
+      type: string
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/network/pnfs
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    pnf-name: $b{pnf.[*].pnf-name}
+    pnf-id: $b{pnf.[*].pnf-id}
+    resource-version: $b{pnf.[*].resource-version}
-- 
cgit 1.2.3-korg


From f50c3bad0076b05cd15dea41ece4d5d48badba13 Mon Sep 17 00:00:00 2001
From: XingXiaocheng <xingxiaocheng@huawei.com>
Date: Tue, 13 Mar 2018 14:31:01 +0000
Subject: logic link cmd create

Change-Id: I66d67081dd7efc10a213138df01d99ff654a787f
Issue-ID: CLI-93
Signed-off-by: xingxiaocheng <xingxiaocheng@huawei.com>
---
 .../logicalLink/logic-link-create-schema.yaml      | 91 ++++++++++++++++++++++
 .../logicalLink/logic-link-delete-schema.yaml      | 47 +++++++++++
 .../logicalLink/logic-link-list-schema.yaml        | 76 ++++++++++++++++++
 .../logicalLink/logic-link-show-schema.yaml        | 84 ++++++++++++++++++++
 .../open-cli-schema/pnf/pnf-create-schema.yaml     | 10 +--
 .../open-cli-schema/pnf/pnf-delete-schema.yaml     |  2 +-
 .../open-cli-schema/pnf/pnf-list-schema.yaml       |  4 +
 .../search/generic-search-schema.yaml              | 75 ++++++++++++++++++
 .../search/node-type-search-schema.yaml            | 63 +++++++++++++++
 ...ervice-instance-relationship-create-schema.yaml | 73 +++++++++++++++++
 ...ervice-instance-relationship-delete-schema.yaml | 74 ++++++++++++++++++
 .../service-instance/service-list-schema-1.1.yaml  | 81 +++++++++++++++++++
 .../open-cli-schema/vnf/vnf-create-schema.yaml     | 67 ++++++++++++++++
 .../open-cli-schema/vnf/vnf-delete-schema.yaml     | 47 +++++++++++
 .../open-cli-schema/vnf/vnf-list-schema.yaml       | 61 +++++++++++++++
 15 files changed, 849 insertions(+), 6 deletions(-)
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-create-schema.yaml
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-delete-schema.yaml
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-list-schema.yaml
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-show-schema.yaml
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/search/generic-search-schema.yaml
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/search/node-type-search-schema.yaml
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-create-schema.yaml
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-delete-schema.yaml
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-create-schema.yaml
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-delete-schema.yaml
 create mode 100644 products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-list-schema.yaml

(limited to 'products/onap-beijing/features')

diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-create-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-create-schema.yaml
new file mode 100644
index 00000000..729cd91a
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-create-schema.yaml
@@ -0,0 +1,91 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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: logic-link-create
+description: Create a logic-link
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: link-name
+    description: logic-link-name
+    type: string
+    short_option: n
+    long_option: name
+    is_optional: false
+  - name: link-type
+    description: link-type
+    type: string
+    short_option: i
+    long_option: link-type
+    is_optional: true
+  - name: speed-value
+    description: speed-value
+    type: string
+    short_option: q
+    long_option: speed-value
+    is_optional: true
+  - name: speed-units
+    description: speed-units
+    type: string
+    short_option: x
+    long_option: speed-units
+    is_optional: true
+  - name: in-maint
+    description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
+    type: bool
+    short_option: w
+    long_option: in-maint
+    is_optional: false
+  - name: prov-status
+    description: Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]
+    type: string
+    short_option: g
+    long_option: prov-status
+    is_optional: true
+  - name: link-role
+    description: link-role
+    type: string
+    short_option: j
+    long_option: link-role
+    is_optional: true
+  - name: link-id
+    description: link-id
+    type: string
+    short_option: z
+    long_option: link-id
+    is_optional: true
+  - name: relationship
+    description: relationship
+    type: json
+    short_option: r
+    long_option: relationship
+    is_optional: true
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/network/logic-links/logic-link/${link-name}
+    method: PUT
+    context:
+      remove_empty_node: true
+    body: '{"link-name": "${link-name}" ,"link-type": "${link-type}","speed-value": "${speed-value}","speed-units": "${speed-units}","in-maint": "${in-maint}","prov-status": "${prov-status}","link-role": "${link-role}","link-id": "${link-id}","relationship-list": ["${relationship}"]}'
+  success_codes:
+    - 200
+    - 201
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-delete-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-delete-schema.yaml
new file mode 100644
index 00000000..bb82f499
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-delete-schema.yaml
@@ -0,0 +1,47 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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: logic-link-delete
+description: Delete logic-link-delete from Onap
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+
+parameters:
+  - name: logic-link-name
+    description: Onap logic-link name
+    type: string
+    short_option: n
+    long_option: logic-link-name
+    is_optional: false
+  - name: resource-version
+    description: Onap logic-link-name resource version
+    type: uuid
+    short_option: b
+    long_option: resource-version
+    is_optional: false
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/network/pnfs/pnf/${logic-link-name}?resource-version=${resource-version}
+    method: DELETE
+  success_codes:
+    - 204
+    - 404
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-list-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-list-schema.yaml
new file mode 100644
index 00000000..eef8b4ce
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-list-schema.yaml
@@ -0,0 +1,76 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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: logic-link-list
+description: Lists the logic-link
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+results:
+  direction: landscape
+  attributes:
+    - name: logic-link-name
+      description: Onap logic-link name
+      scope: short
+      type: string
+    - name: logic-link-id
+      description: Onap logic-link id
+      scope: short
+      type: string
+    - name: in-maint
+      description: Onap in-maint
+      scope: short
+      type: string
+    - name: speed-value
+      description: Onap speed-value 
+      scope: short
+      type: string
+    - name: speed-units
+      description: Onap speed-units 
+      scope: short
+      type: string
+    - name: prov-status
+      description: Onap prov-status 
+      scope: short
+      type: string
+    - name: link-role
+      description: Onap link-role 
+      scope: short
+      type: string
+    - name: resource-version
+      description: Onap resource-version
+      scope: short
+      type: string
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/network/logical-links/
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    logic-link-name: $b{logical-link.[*].link-name}
+    logic-link-id: $b{logical-link.[*].link-id}
+    in-maint: $b{logical-link.[*].in-maint}
+    speed-value: $b{logical-link.[*].speed-value}
+    speed-units: $b{logical-link.[*].speed-units}
+    prov-status: $b{logical-link.[*].prov-status}
+    link-role: $b{logical-link.[*].link-role}
+    resource-version: $b{logical-link.[*].resource-version}
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-show-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-show-schema.yaml
new file mode 100644
index 00000000..f22e9795
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/logicalLink/logic-link-show-schema.yaml
@@ -0,0 +1,84 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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: logic-link-list
+description: show detail for one single logic-link
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+  
+parameters:
+  - name: logic-link-name
+    description: logic-link-name
+    type: string
+    short_option: n
+    long_option: name
+    is_optional: false
+
+results:
+  direction: landscape
+  attributes:
+    - name: logic-link-name
+      description: Onap logic-link name
+      scope: short
+      type: string
+    - name: logic-link-id
+      description: Onap logic-link id
+      scope: short
+      type: string
+    - name: in-maint
+      description: Onap in-maint
+      scope: short
+      type: string
+    - name: speed-value
+      description: Onap speed-value 
+      scope: short
+      type: string
+    - name: speed-units
+      description: Onap speed-units 
+      scope: short
+      type: string
+    - name: prov-status
+      description: Onap prov-status 
+      scope: short
+      type: string
+    - name: link-role
+      description: Onap link-role 
+      scope: short
+      type: string
+    - name: resource-version
+      description: Onap resource-version
+      scope: short
+      type: string
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/network/logical-links/logical-link/${logic-link-name}
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    logic-link-name: $b{logical-link.[*].link-name}
+    logic-link-id: $b{logical-link.[*].link-id}
+    in-maint: $b{logical-link.[*].in-maint}
+    speed-value: $b{logical-link.[*].speed-value}
+    speed-units: $b{logical-link.[*].speed-units}
+    prov-status: $b{logical-link.[*].prov-status}
+    link-role: $b{logical-link.[*].link-role}
+    resource-version: $b{logical-link.[*].resource-version}
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-create-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-create-schema.yaml
index 7b7b3bbb..bb5f4331 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-create-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-create-schema.yaml
@@ -37,25 +37,25 @@ parameters:
   - name: equip-type
     description: equip-type
     type: string
-    short_option: t
+    short_option: q
     long_option: equipType
     is_optional: true
   - name: equip-vendor
     description: equip-vendor
     type: string
-    short_option: v
+    short_option: x
     long_option: equip-vendor
     is_optional: true
   - name: in-maint
     description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
     type: bool
-    short_option: i
+    short_option: w
     long_option: in-maint
     is_optional: true
   - name: prov-status
     description: Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]
     type: string
-    short_option: s
+    short_option: g
     long_option: prov-status
     is_optional: true
   - name: relationship
@@ -73,7 +73,7 @@ http:
     method: PUT
     context:
       remove_empty_node: true
-    body: '{"pnf-name": "${pnf-name}" ,"pnf-id": "${pnf-id}","equip-type": "${equip-type}","equip-vendor": "${equip-vendor}"，"in-maint": ${in-maint}，"prov-status": "${prov-status}"，"relationship-list": ["${relationship}"]}'
+    body: '{"pnf-name": "${pnf-name}" ,"pnf-id": "${pnf-id}","equip-type": "${equip-type}","equip-vendor": "${equip-vendor}","in-maint": "${in-maint}","prov-status": "${prov-status}","relationship-list": ["${relationship}"]}'
   success_codes:
     - 200
     - 201
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-delete-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-delete-schema.yaml
index cbc4b57c..f4be138c 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-delete-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-delete-schema.yaml
@@ -32,7 +32,7 @@ parameters:
   - name: resource-version
     description: Onap pnf resource version
     type: uuid
-    short_option: v
+    short_option: b
     long_option: resource-version
     is_optional: false
 http:
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-list-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-list-schema.yaml
index fd5832b0..f989828f 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-list-schema.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/pnf/pnf-list-schema.yaml
@@ -32,6 +32,10 @@ results:
       description: Onap pnf id
       scope: short
       type: string
+    - name: resource-version
+      description: Onap resource-version
+      scope: short
+      type: string
 http:
   service:
     auth: basic
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/search/generic-search-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/search/generic-search-schema.yaml
new file mode 100644
index 00000000..f4bb2f33
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/search/generic-search-schema.yaml
@@ -0,0 +1,75 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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: generic-search
+description: generic-search 
+#sample:  https://172.19.44.123:8443/aai/v11/search/generic-query?key=customer.global-customer-id:Orange&include=all&start-node-type=customer&depth=6 
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: key
+    description: key
+    type: string
+    short_option: k
+    long_option: key
+    is_optional: false
+  - name: value
+    description: value
+    type: string
+    short_option: z
+    long_option: value
+    is_optional: false
+  - name: start-node-type
+    description: start-node-type
+    type: string
+    short_option: r
+    long_option: start-node-type
+    is_optional: false
+  - name: depth
+    description: search depth
+    type: digit
+    short_option: e
+    long_option: depth
+    is_optional: false
+results:
+  direction: landscape
+  attributes:
+    - name: resource-type
+      description: Onap result-type
+      scope: short
+      type: string
+    - name: resource-link
+      description: Onap resource-link
+      scope: short
+      type: string
+    
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/search/generic-query?key=${key}:${value}&include=all&start-node-type=${start-node-type}&depth=${depth}
+    method: GET
+  success_codes:
+    - 200
+    - 201
+  result_map:
+    resource-type: $b{result-data.[*].resource-type}
+    resource-link: $b{result-data.[*].resource-link}
+    
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/search/node-type-search-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/search/node-type-search-schema.yaml
new file mode 100644
index 00000000..1156f5f8
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/search/node-type-search-schema.yaml
@@ -0,0 +1,63 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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: type-search
+description: type-search 
+#sample:  https://172.19.44.123:8443/aai/v11/search/nodes-query?search-node-type=customer&filter=global-customer-id:EQUALS:Orange 
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: node-type-name
+    description: node type name
+    type: string
+    short_option: n
+    long_option: node-type-name
+    is_optional: false
+  - name: filter
+    description: filter for earch, like ,global-customer-id:EQUALS:Orange
+    type: string
+    short_option: c
+    long_option: filter
+    is_optional: false
+results:
+  direction: landscape
+  attributes:
+    - name: resource-type
+      description: Onap resource-type
+      scope: short
+      type: string
+    - name: resource-link
+      description: Onap resource-link
+      scope: short
+      type: string
+    
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/search/nodes-query?search-node-type=${node-type-name}&filter=${filter}
+    method: GET
+  success_codes:
+    - 200
+    - 201
+  result_map:
+    resource-type: $b{result-data.[*].resource-type}
+    resource-link: $b{result-data.[*].resource-link}
+    
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-create-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-create-schema.yaml
new file mode 100644
index 00000000..44f3a707
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-create-schema.yaml
@@ -0,0 +1,73 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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-relationship-create
+description: Create a service instance relationship for vnf/pnf
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: global-customer-id
+    description: global-customer-id
+    type: string
+    short_option: g
+    long_option: global-customer-id
+    is_optional: false
+  - name: service-type
+    description: service-type 
+    type: string
+    short_option: z
+    long_option: service-type
+    is_optional: false
+  - name: service-instance-id
+    description: service-instance-id
+    type: string
+    short_option: i
+    long_option: service-instance-id
+    is_optional: false
+  - name: relationship
+    description: relationship
+    type: json
+    short_option: r
+    long_option: relationship
+    is_optional: false
+# sample json of relationship
+#            {
+#                "related-to": "logical-link",
+#                "related-link": "/aai/v11/network/logical-links/logical-link/S11-00001",
+#                "relationship-data": [
+#                    {
+#                        "relationship-key": "logical-link.link-name",
+#                        "relationship-value": "S11-00001"
+#                    }
+#                ]
+#            }
+    
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /business/customers/customer/${global-customer-id}/service-subscriptions/service-subscription/${service-type}/service-instances/service-instance/${service-instance-id}/relationship-list/relationship	
+    method: PUT
+    context:
+      remove_empty_node: true
+    body: '"${relationship}"'
+  success_codes:
+    - 200
+    - 201
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-delete-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-delete-schema.yaml
new file mode 100644
index 00000000..236a69e7
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-instance-relationship-delete-schema.yaml
@@ -0,0 +1,74 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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-relationship-delete
+description: delete a service instance relationship for vnf/pnf
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: global-customer-id
+    description: global-customer-id
+    type: string
+    short_option: g
+    long_option: global-customer-id
+    is_optional: false
+  - name: service-type
+    description: service-type 
+    type: string
+    short_option: z
+    long_option: service-type
+    is_optional: false
+  - name: service-instance-id
+    description: service-instance-id
+    type: string
+    short_option: i
+    long_option: service-instance-id
+    is_optional: false
+  - name: relationship
+    description: relationship
+    type: json
+    short_option: r
+    long_option: relationship
+    is_optional: false
+# sample json of relationship
+#            {
+#                "related-to": "logical-link",
+#                "related-link": "/aai/v11/network/logical-links/logical-link/S11-00001",
+#                "relationship-data": [
+#                    {
+#                        "relationship-key": "logical-link.link-name",
+#                        "relationship-value": "S11-00001"
+#                    }
+#                ]
+#            }
+    
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /business/customers/customer/${global-customer-id}/service-subscriptions/service-subscription/${service-type}/service-instances/service-instance/${service-instance-id}/relationship-list/relationship	
+    method: DELETE
+    context:
+      remove_empty_node: true
+    body: '"${relationship}"'
+  success_codes:
+    - 200
+    - 201
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml
new file mode 100644
index 00000000..6690af65
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml
@@ -0,0 +1,81 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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 created service instance
+
+info:
+  product: onap-beijing
+  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/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-create-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-create-schema.yaml
new file mode 100644
index 00000000..a50f4a2e
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-create-schema.yaml
@@ -0,0 +1,67 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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-create
+description: Create a vnf
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: vnf-name
+    description: vnf-name
+    type: string
+    short_option: n
+    long_option: name
+    is_optional: true
+  - name: vnf-id
+    description: vnf-id
+    type: string
+    short_option: i
+    long_option: vnf-id
+    is_optional: false
+  - name: vnf-type
+    description: vnf-type
+    type: string
+    short_option: z
+    long_option: vnf-type
+    is_optional: true
+  - name: in-maint
+    description: Used to indicate whether or not this object is in maintenance mode (maintenance mode = true)
+    type: bool
+    short_option: w
+    long_option: in-maint
+    is_optional: true
+  - name: relationship
+    description: relationship
+    type: json
+    short_option: r
+    long_option: relationship
+    is_optional: true
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/network/generic-vnfs/generic-vnf/${vnf-id}
+    method: PUT
+    context:
+      remove_empty_node: true
+    body: '{"vnf-id": "${vnf-id}","vnf-name": "${vnf-name}" ,"vnf-type": "${vnf-type}","in-maint": "${in-maint}","relationship-list": ["${relationship}"]}'
+  success_codes:
+    - 200
+    - 201
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-delete-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-delete-schema.yaml
new file mode 100644
index 00000000..1a1e3fe1
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-delete-schema.yaml
@@ -0,0 +1,47 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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-delete
+description: Delete vnf from Onap
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+
+parameters:
+  - name: vnf-id
+    description: Onap vnf id
+    type: string
+    short_option: i
+    long_option: vnf-id
+    is_optional: false
+  - name: resource-version
+    description: Onap vnf resource version
+    type: uuid
+    short_option: b
+    long_option: resource-version
+    is_optional: false
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/network/generic-vnfs/generic-vnf/${vnf-id}?resource-version=${resource-version}
+    method: DELETE
+  success_codes:
+    - 204
+    - 404
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-list-schema.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-list-schema.yaml
new file mode 100644
index 00000000..2b5b844a
--- /dev/null
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/vnf/vnf-list-schema.yaml
@@ -0,0 +1,61 @@
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# 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: Lists the vnfs
+
+info:
+  product: onap-beijing
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+results:
+  direction: landscape
+  attributes:
+    - name: vnf-name
+      description: Onap vnf name
+      scope: short
+      type: string
+    - name: vnf-id
+      description: Onap vnf id
+      scope: short
+      type: string
+    - name: vnf-type
+      description: Onap vnf-type
+      scope: short
+      type: string
+    - name: in-maint
+      description: Onap in-maint
+      scope: short
+      type: string
+    - name: resource-version
+      description: Onap resource-version
+      scope: short
+      type: string
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v11/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}
+    in-maint: $b{generic-vnf.[*].in-maint}
+    resource-version: $b{generic-vnf.[*].resource-version}
-- 
cgit 1.2.3-korg